P6 NOPs again: MPSC?

[Hugh Dickins]

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 which I'm guessing it ought to (yeah, I'm so excited
about the speedup I can expect from P6 NOPs, can we perhaps have a
little silvery "Using Genuine P6 NOPs" sticker to put on the box? ;)

I'm suspecting that the patch below is actually wrong, and that it's
really the "(X86_64 || !X86_GENERIC) &&" which should be changed;
but very unsure of my ground and what's right for CPU_GENERIC -
the 32/64 heritage of x86/Kconfig.cpu rather confuses me.

Over to you to do the right thing, I'm hoping, please, Peter!

Thanks,
Hugh

--- 2.6.25-rc5/arch/x86/Kconfig.cpu	2008-03-05 11:27:23.000000000 +0000
+++ linux/arch/x86/Kconfig.cpu	2008-03-10 18:48:10.000000000 +0000
@@ -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

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/