Commit d2b3bab6 authored Apr 03, 2008 by Hugh Dickins Committed by Ingo Molnar Apr 17, 2008

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>

parent 431ef7a2

arch/x86/Kconfig.cpu

+1 −1

Original line number	Diff line number	Diff line
		@@ -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

Admin message