summaryrefslogtreecommitdiff
path: root/arch/x86/Kconfig.cpu
diff options
context:
space:
mode:
authorHugh Dickins <hugh@veritas.com>2008-04-04 02:48:29 +0400
committerIngo Molnar <mingo@elte.hu>2008-04-17 19:41:34 +0400
commitd2b3bab63bd9999a29eb74326a7baf61901385e6 (patch)
treef065540d231ae7f0ca16c28ed0fb865295746d21 /arch/x86/Kconfig.cpu
parent431ef7a2a486201967304fcc9cfc33e945626fed (diff)
downloadlinux-d2b3bab63bd9999a29eb74326a7baf61901385e6.tar.xz
x86: MPSC should use P6 NOPs
I've now noticed that the machine I call MPENTIUM4 for 32-bit kernels is called MPSC for 64-bit kernels, and in that case it still doesn't get the P6 NOPs it ought to. hpa explains that MK8 should still be excluded, so it's just a matter of including MPSC along with MPENTIUM4. Signed-off-by: Hugh Dickins <hugh@veritas.com> Acked-by: H. Peter Anvin <hpa@zytor.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/Kconfig.cpu')
-rw-r--r--arch/x86/Kconfig.cpu2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/Kconfig.cpu b/arch/x86/Kconfig.cpu
index 9304bfba7d45..57072f2716f9 100644
--- a/arch/x86/Kconfig.cpu
+++ b/arch/x86/Kconfig.cpu
@@ -388,7 +388,7 @@ config X86_OOSTORE
#
config X86_P6_NOP
def_bool y
- depends on (X86_64 || !X86_GENERIC) && (M686 || MPENTIUMII || MPENTIUMIII || MPENTIUMM || MCORE2 || MPENTIUM4)
+ depends on (X86_64 || !X86_GENERIC) && (M686 || MPENTIUMII || MPENTIUMIII || MPENTIUMM || MCORE2 || MPENTIUM4 || MPSC)
config X86_TSC
def_bool y