[PATCH 2/2] x86: Simplify X86_CMPXCHG, CMPXCHG_LOCAL, and X86_XADD

From: Brian Gerst
Date: Sun Jul 10 2011 - 09:53:30 EST


X86_64 and M386 can never be both set, so reduce the conditional to !M386.

Signed-off-by: Brian Gerst <brgerst@xxxxxxxxx>
---
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

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