LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Ingo Molnar <mingo@elte.hu>
To: "H. Peter Anvin" <hpa@zytor.com>
Cc: Hugh Dickins <hugh@veritas.com>,
	Linus Torvalds <torvalds@linux-foundation.org>,
	Andrew Morton <akpm@linux-foundation.org>,
	Thomas Gleixner <tglx@linutronix.de>,
	linux-kernel@vger.kernel.org
Subject: Re: [PATCH] x86: a P4 is a P6 not an i486
Date: Tue, 4 Mar 2008 22:32:43 +0100	[thread overview]
Message-ID: <20080304213243.GC8944@elte.hu> (raw)
In-Reply-To: <47CDBE09.3060000@zytor.com>


* 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

  reply	other threads:[~2008-03-04 21:33 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-03-04 19:33 Hugh Dickins
2008-03-04 21:01 ` Ingo Molnar
2008-03-04 21:24   ` H. Peter Anvin
2008-03-04 21:32     ` Ingo Molnar [this message]
2008-03-10 19:14     ` P6 NOPs again: MPSC? Hugh Dickins
2008-03-10 20:17       ` H. Peter Anvin
2008-03-10 22:02         ` Hugh Dickins
2008-03-11  6:43           ` H. Peter Anvin
2008-03-11 14:00             ` Hugh Dickins
2008-03-11  9:28           ` Ingo Molnar
2008-03-11 13:45             ` Hugh Dickins

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20080304213243.GC8944@elte.hu \
    --to=mingo@elte.hu \
    --cc=akpm@linux-foundation.org \
    --cc=hpa@zytor.com \
    --cc=hugh@veritas.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=tglx@linutronix.de \
    --cc=torvalds@linux-foundation.org \
    --subject='Re: [PATCH] x86: a P4 is a P6 not an i486' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).