[PATCH] x86, cpu: X86_FEATURE_NOPL should be disabled on 32-bit only

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
From: Borislav Petkov
Date: Sunday, October 3, 2010 - 8:22 am

ba0593bf553c450a03dbc5f8c1f0ff58b778a0c8 cleared the aforementioned
cpuid bit only on 32-bit due to various problems with Virtual PC. This
somehow got lost during the 32- + 64-bit merge so restore the feature
bit on 64-bit.

Signed-off-by: Borislav Petkov <bp@alien8.de>
---
 arch/x86/kernel/cpu/common.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
index caa967d..9a2cfeb 100644
--- a/arch/x86/kernel/cpu/common.c
+++ b/arch/x86/kernel/cpu/common.c
@@ -713,7 +713,9 @@ void __init early_cpu_init(void)
  */
 static void __cpuinit detect_nopl(struct cpuinfo_x86 *c)
 {
+#ifdef CONFIG_X86_32
 	clear_cpu_cap(c, X86_FEATURE_NOPL);
+#endif
 }
 
 static void __cpuinit generic_identify(struct cpuinfo_x86 *c)
-- 
1.7.2.3

-- 
Regards/Gruss,
    Boris.
--
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
NOPL on 32-bit, Borislav Petkov, (Sun Oct 3, 2:37 am)
Re: NOPL on 32-bit, H. Peter Anvin, (Sun Oct 3, 7:43 am)
[PATCH] x86, cpu: X86_FEATURE_NOPL should be disabled on 3 ..., Borislav Petkov, (Sun Oct 3, 8:22 am)
[PATCH] x86, cpu: Fix X86_FEATURE_NOPL, Borislav Petkov, (Mon Oct 4, 12:31 am)
[tip:x86/cpu] x86, cpu: Fix X86_FEATURE_NOPL, tip-bot for Borislav ..., (Mon Oct 4, 1:36 pm)
Re: [PATCH] x86, cpu: Fix X86_FEATURE_NOPL, Linus Torvalds, (Mon Oct 4, 1:47 pm)
Re: [PATCH] x86, cpu: Fix X86_FEATURE_NOPL, H. Peter Anvin, (Mon Oct 4, 2:02 pm)
Re: [PATCH] x86, cpu: Fix X86_FEATURE_NOPL, Linus Torvalds, (Mon Oct 4, 2:12 pm)
Re: [PATCH] x86, cpu: Fix X86_FEATURE_NOPL, H. Peter Anvin, (Mon Oct 4, 2:21 pm)
Re: [PATCH] x86, cpu: Fix X86_FEATURE_NOPL, Borislav Petkov, (Mon Oct 4, 2:48 pm)
Re: [PATCH] x86, cpu: Fix X86_FEATURE_NOPL, H. Peter Anvin, (Mon Oct 4, 2:50 pm)
Re: [PATCH] x86, cpu: Fix X86_FEATURE_NOPL, H. Peter Anvin, (Mon Oct 4, 2:53 pm)
Re: [PATCH] x86, cpu: Fix X86_FEATURE_NOPL, Hugh Dickins, (Mon Oct 4, 3:17 pm)
Re: [PATCH] x86, cpu: Fix X86_FEATURE_NOPL, H. Peter Anvin, (Mon Oct 4, 3:19 pm)
Re: [PATCH] x86, cpu: Fix X86_FEATURE_NOPL, Borislav Petkov, (Mon Oct 4, 11:19 pm)
Re: [tip:x86/cpu] x86, cpu: Fix X86_FEATURE_NOPL, Borislav Petkov, (Tue Oct 5, 2:47 am)
Re: [tip:x86/cpu] x86, cpu: Fix X86_FEATURE_NOPL, H. Peter Anvin, (Tue Oct 5, 9:30 am)
Re: [tip:x86/cpu] x86, cpu: Fix X86_FEATURE_NOPL, Borislav Petkov, (Tue Oct 5, 9:53 am)