From: Brian Gerst <brgerst@gmail.com>
To: hpa@zytor.com
Cc: x86@kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH 2/2] x86: Simplify X86_CMPXCHG, CMPXCHG_LOCAL, and X86_XADD
Date: Sun, 10 Jul 2011 09:53:20 -0400 [thread overview]
Message-ID: <1310306000-2447-2-git-send-email-brgerst@gmail.com> (raw)
In-Reply-To: <1310306000-2447-1-git-send-email-brgerst@gmail.com>
X86_64 and M386 can never be both set, so reduce the conditional to !M386.
Signed-off-by: Brian Gerst <brgerst@gmail.com>
---
arch/x86/Kconfig.cpu | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/arch/x86/Kconfig.cpu b/arch/x86/Kconfig.cpu
index d801dfe..a913325 100644
--- a/arch/x86/Kconfig.cpu
+++ b/arch/x86/Kconfig.cpu
@@ -307,10 +307,10 @@ config X86_INTERNODE_CACHE_SHIFT
default X86_L1_CACHE_SHIFT
config X86_CMPXCHG
- def_bool X86_64 || (X86_32 && !M386)
+ def_bool !M386
config CMPXCHG_LOCAL
- def_bool X86_64 || (X86_32 && !M386)
+ def_bool !M386
config X86_L1_CACHE_SHIFT
int
@@ -320,8 +320,7 @@ config X86_L1_CACHE_SHIFT
default "5" if MWINCHIP3D || MWINCHIPC6 || MCRUSOE || MEFFICEON || MCYRIXIII || MK6 || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || M586 || MVIAC3_2 || MGEODE_LX
config X86_XADD
- def_bool y
- depends on X86_64 || !M386
+ def_bool !M386
config X86_PPRO_FENCE
bool "PentiumPro memory ordering errata workaround"
--
1.7.4.4
next prev parent reply other threads:[~2011-07-10 13:53 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-10 13:53 [PATCH 1/2] x86-64: Simplify cpu_has_invlpg Brian Gerst
2011-07-10 13:53 ` Brian Gerst [this message]
2011-07-10 16:35 ` [PATCH 2/2] x86: Simplify X86_CMPXCHG, CMPXCHG_LOCAL, and X86_XADD Pekka Enberg
2011-07-10 16:34 ` [PATCH 1/2] x86-64: Simplify cpu_has_invlpg Pekka Enberg
2011-07-10 18:18 ` H. Peter Anvin
2011-07-11 11:50 ` Brian Gerst
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=1310306000-2447-2-git-send-email-brgerst@gmail.com \
--to=brgerst@gmail.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=x86@kernel.org \
/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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox