LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Hugh Dickins <hugh@veritas.com>
To: "H. Peter Anvin" <hpa@zytor.com>
Cc: Ingo Molnar <mingo@elte.hu>,
	Linus Torvalds <torvalds@linux-foundation.org>,
	Andrew Morton <akpm@linux-foundation.org>,
	Thomas Gleixner <tglx@linutronix.de>,
	linux-kernel@vger.kernel.org
Subject: Re: P6 NOPs again: MPSC?
Date: Tue, 11 Mar 2008 14:00:12 +0000 (GMT)	[thread overview]
Message-ID: <Pine.LNX.4.64.0803111346150.22181@blonde.site> (raw)
In-Reply-To: <47D62A0D.3070107@zytor.com>

On Tue, 11 Mar 2008, H. Peter Anvin wrote:
> Hugh Dickins wrote:
> > 
> > Yup, I realized that (with || in place of &&): I meant that perhaps
> > it was supposed to say X86_64 || (!X86_GENERIC && (M686 || ....))
> > since quite a lot of other options there have "|| X86_64" to cover
> > all the 64-bit possibilities at once i.e. is it only MPSC that
> > needs to be added, or both MPSC and CPU_GENERIC?
> 
> No.  The left-hand clause (X86_64 || !X86_GENERIC) indicates when using these
> NOPs are *permitted*; the right-hand clause indicates when doing so is
> *desirable*.  The latter isn't, for example, for K8, even on 64 bits.

Okay, so if we're to exclude CPU_GENERIC and MK8, I think that
makes my original patch the right one: here it is with a signoff.


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>

--- 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



  reply	other threads:[~2008-03-11 20:58 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-03-04 19:33 [PATCH] x86: a P4 is a P6 not an i486 Hugh Dickins
2008-03-04 21:01 ` Ingo Molnar
2008-03-04 21:24   ` H. Peter Anvin
2008-03-04 21:32     ` Ingo Molnar
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 [this message]
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=Pine.LNX.4.64.0803111346150.22181@blonde.site \
    --to=hugh@veritas.com \
    --cc=akpm@linux-foundation.org \
    --cc=hpa@zytor.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@elte.hu \
    --cc=tglx@linutronix.de \
    --cc=torvalds@linux-foundation.org \
    --subject='Re: P6 NOPs again: MPSC?' \
    /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).