Merge branch 'x86-cpufeature-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull x86 cpufeature update from Ingo Molnar:
 "Two refinements to clflushopt support"

* 'x86-cpufeature-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86, cpufeature: If we disable CLFLUSH, we should disable CLFLUSHOPT
  x86, cpufeature: Rename X86_FEATURE_CLFLSH to X86_FEATURE_CLFLUSH

2 files changed, 3 insertions, 2 deletions

diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
index 8e28bf2fc3ef..cca53d88762a 100644
--- a/arch/x86/kernel/cpu/common.c
+++ b/arch/x86/kernel/cpu/common.c
@@ -1025,7 +1025,8 @@ __setup("show_msr=", setup_show_msr);
 
 static __init int setup_noclflush(char *arg)
 {
-        setup_clear_cpu_cap(X86_FEATURE_CLFLSH);
+        setup_clear_cpu_cap(X86_FEATURE_CLFLUSH);
+        setup_clear_cpu_cap(X86_FEATURE_CLFLUSHOPT);
         return 1;
 }
 __setup("noclflush", setup_noclflush);
diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
index 60179ec39d4c..5aad5a370c85 100644
--- a/arch/x86/kernel/smpboot.c
+++ b/arch/x86/kernel/smpboot.c
@@ -1387,7 +1387,7 @@ static inline void mwait_play_dead(void)
 
         if (!this_cpu_has(X86_FEATURE_MWAIT))
                 return;
-        if (!this_cpu_has(X86_FEATURE_CLFLSH))
+        if (!this_cpu_has(X86_FEATURE_CLFLUSH))
                 return;
         if (__this_cpu_read(cpu_info.cpuid_level) < CPUID_MWAIT_LEAF)
                 return;