UBUNTU: SAUCE: Set generic SSBD feature for Intel cpus

[mirror_ubuntu-artful-kernel.git] / arch / x86 / kernel / cpu / intel.c

diff --git a/arch/x86/kernel/cpu/intel.c b/arch/x86/kernel/cpu/intel.c
index 8fa91ad1610b47411ff567d03d62088bde4c8034..81b4f10db8abd2670830418ddd362dcef4e2d1a3 100644 (file)
--- a/arch/x86/kernel/cpu/intel.c
+++ b/arch/x86/kernel/cpu/intel.c
@@ -642,6 +642,10 @@ static void init_intel(struct cpuinfo_x86 *c)
                        printk(KERN_INFO "FEATURE SPEC_CTRL Not Present\n");
                }
        }
+
+       if (cpu_has(c, X86_FEATURE_SPEC_CTRL_SSBD) ||
+           cpu_has(c, X86_FEATURE_VIRT_SSBD))
+               set_cpu_cap(c, X86_FEATURE_SSBD);
 }
 
 #ifdef CONFIG_X86_32