summaryrefslogtreecommitdiffstats
path: root/arch/x86/Kconfig.cpu
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2010-12-18 15:54:36 +0100
committerTejun Heo <tj@kernel.org>2010-12-18 15:54:36 +0100
commit05c2d088d0eb904e50460b04d77324c26cef4637 (patch)
tree1dab544e05f9021a02e76adcbdb5edf4b31c7d62 /arch/x86/Kconfig.cpu
parentconnector: Use this_cpu operations (diff)
parentcpuops: Use cmpxchg for xchg to avoid lock semantics (diff)
downloadlinux-05c2d088d0eb904e50460b04d77324c26cef4637.tar.xz
linux-05c2d088d0eb904e50460b04d77324c26cef4637.zip
Merge branch 'this_cpu_ops' into for-2.6.38
Diffstat (limited to 'arch/x86/Kconfig.cpu')
-rw-r--r--arch/x86/Kconfig.cpu3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/x86/Kconfig.cpu b/arch/x86/Kconfig.cpu
index 2ac9069890cd..15588a0ef466 100644
--- a/arch/x86/Kconfig.cpu
+++ b/arch/x86/Kconfig.cpu
@@ -310,6 +310,9 @@ config X86_INTERNODE_CACHE_SHIFT
config X86_CMPXCHG
def_bool X86_64 || (X86_32 && !M386)
+config CMPXCHG_LOCAL
+ def_bool X86_64 || (X86_32 && !M386)
+
config X86_L1_CACHE_SHIFT
int
default "7" if MPENTIUM4 || MPSC