summaryrefslogtreecommitdiff
path: root/arch/x86/include/asm/mwait.h
diff options
context:
space:
mode:
authorBorislav Petkov <bp@suse.de>2014-06-18 02:06:23 +0400
committerH. Peter Anvin <hpa@linux.intel.com>2014-06-19 02:27:04 +0400
commit9b13a93df267af681a66a6a738bf1af10102da7d (patch)
tree7270414ed60ddcb699f9e154371ce28550c60d30 /arch/x86/include/asm/mwait.h
parent03ab3da3b215bac4ebb093c808d54596e03e3225 (diff)
downloadlinux-9b13a93df267af681a66a6a738bf1af10102da7d.tar.xz
x86, cpufeature: Convert more "features" to bugs
X86_FEATURE_FXSAVE_LEAK, X86_FEATURE_11AP and X86_FEATURE_CLFLUSH_MONITOR are not really features but synthetic bits we use for applying different bug workarounds. Call them what they really are, and make sure they get the proper cross-CPU behavior (OR rather than AND). Signed-off-by: Borislav Petkov <bp@suse.de> Link: http://lkml.kernel.org/r/1403042783-23278-1-git-send-email-bp@alien8.de Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'arch/x86/include/asm/mwait.h')
-rw-r--r--arch/x86/include/asm/mwait.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/include/asm/mwait.h b/arch/x86/include/asm/mwait.h
index 1da25a5f96f9..a1410db38a1a 100644
--- a/arch/x86/include/asm/mwait.h
+++ b/arch/x86/include/asm/mwait.h
@@ -43,7 +43,7 @@ static inline void __mwait(unsigned long eax, unsigned long ecx)
static inline void mwait_idle_with_hints(unsigned long eax, unsigned long ecx)
{
if (!current_set_polling_and_test()) {
- if (static_cpu_has(X86_FEATURE_CLFLUSH_MONITOR)) {
+ if (static_cpu_has_bug(X86_BUG_CLFLUSH_MONITOR)) {
mb();
clflush((void *)&current_thread_info()->flags);
mb();