Re: [PATCH] x86: a P4 is a P6 not an i486

[Ingo Molnar <mingo@elte.hu>]

* H. Peter Anvin <hpa@zytor.com> wrote:

>>> P4 has been coming out as CPU_FAMILY=4 instead of 6: fix MPENTIUM4 
>>> typo.
>>
>> thanks Hugh, applied.
>
> The patch is correct, obviously; the comment is not: the real comment 
> should be:
>
> Enable the use of P6 NOPs on Pentium 4
>
> The CPU_FAMILY field is really the minimum CPU family that can boot 
> the kernel (that's why there is no 5; we don't have any i586 family 
> dependencies not encoded by CPUID bits.)

yeah, i've updated the commit. (find it below)

	Ingo

----------->
Subject: x86: enable the use of P6 NOPs on Pentium 4
From: Hugh Dickins <hugh@veritas.com>
Date: Tue, 4 Mar 2008 19:33:24 +0000 (GMT)

fix MPENTIUM4 typo - it resulted in P4s using less optimal NOPs.

Signed-off-by: Hugh Dickins <hugh@veritas.com>
Acked-by: H. Peter Anvin <hpa@zytor.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---
 arch/x86/Kconfig.cpu |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: linux-x86.q/arch/x86/Kconfig.cpu
===================================================================
--- linux-x86.q.orig/arch/x86/Kconfig.cpu
+++ linux-x86.q/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 || PENTIUM4)
+	depends on (X86_64 || !X86_GENERIC) && (M686 || MPENTIUMII || MPENTIUMIII || MPENTIUMM || MCORE2 || MPENTIUM4)
 
 config X86_TSC
 	def_bool y