diff options
author | Heiko Carstens <heiko.carstens@de.ibm.com> | 2012-01-12 20:17:33 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-12 23:13:03 -0500 |
commit | 2565409fc0303f3ab8d66b8326702a687962a29b (patch) | |
tree | b57f238d77ee87a991371a7021462b8c71351659 /arch | |
parent | 4156153c4daddf12dd386016f96a947a01e93bf4 (diff) |
mm,x86,um: move CMPXCHG_DOUBLE config option
Move CMPXCHG_DOUBLE and rename it to HAVE_CMPXCHG_DOUBLE so architectures
can simply select the option if it is supported.
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Acked-by: Christoph Lameter <cl@linux.com>
Cc: Pekka Enberg <penberg@kernel.org>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/Kconfig | 3 | ||||
-rw-r--r-- | arch/x86/Kconfig | 1 | ||||
-rw-r--r-- | arch/x86/Kconfig.cpu | 3 | ||||
-rw-r--r-- | arch/x86/um/Kconfig | 4 |
4 files changed, 4 insertions, 7 deletions
diff --git a/arch/Kconfig b/arch/Kconfig index 22182a8cc62c..4f55c736be11 100644 --- a/arch/Kconfig +++ b/arch/Kconfig | |||
@@ -196,4 +196,7 @@ config HAVE_ALIGNED_STRUCT_PAGE | |||
196 | config HAVE_CMPXCHG_LOCAL | 196 | config HAVE_CMPXCHG_LOCAL |
197 | bool | 197 | bool |
198 | 198 | ||
199 | config HAVE_CMPXCHG_DOUBLE | ||
200 | bool | ||
201 | |||
199 | source "kernel/gcov/Kconfig" | 202 | source "kernel/gcov/Kconfig" |
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 59717fd17bc7..6c14ecd851d0 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig | |||
@@ -62,6 +62,7 @@ config X86 | |||
62 | select ANON_INODES | 62 | select ANON_INODES |
63 | select HAVE_ALIGNED_STRUCT_PAGE if SLUB && !M386 | 63 | select HAVE_ALIGNED_STRUCT_PAGE if SLUB && !M386 |
64 | select HAVE_CMPXCHG_LOCAL if !M386 | 64 | select HAVE_CMPXCHG_LOCAL if !M386 |
65 | select HAVE_CMPXCHG_DOUBLE | ||
65 | select HAVE_ARCH_KMEMCHECK | 66 | select HAVE_ARCH_KMEMCHECK |
66 | select HAVE_USER_RETURN_NOTIFIER | 67 | select HAVE_USER_RETURN_NOTIFIER |
67 | select ARCH_BINFMT_ELF_RANDOMIZE_PIE | 68 | select ARCH_BINFMT_ELF_RANDOMIZE_PIE |
diff --git a/arch/x86/Kconfig.cpu b/arch/x86/Kconfig.cpu index 99d2ab8b7795..3c57033e2211 100644 --- a/arch/x86/Kconfig.cpu +++ b/arch/x86/Kconfig.cpu | |||
@@ -309,9 +309,6 @@ config X86_INTERNODE_CACHE_SHIFT | |||
309 | config X86_CMPXCHG | 309 | config X86_CMPXCHG |
310 | def_bool X86_64 || (X86_32 && !M386) | 310 | def_bool X86_64 || (X86_32 && !M386) |
311 | 311 | ||
312 | config CMPXCHG_DOUBLE | ||
313 | def_bool y | ||
314 | |||
315 | config X86_L1_CACHE_SHIFT | 312 | config X86_L1_CACHE_SHIFT |
316 | int | 313 | int |
317 | default "7" if MPENTIUM4 || MPSC | 314 | default "7" if MPENTIUM4 || MPSC |
diff --git a/arch/x86/um/Kconfig b/arch/x86/um/Kconfig index a62bfc66239e..b2b54d2edf53 100644 --- a/arch/x86/um/Kconfig +++ b/arch/x86/um/Kconfig | |||
@@ -6,10 +6,6 @@ menu "UML-specific options" | |||
6 | 6 | ||
7 | menu "Host processor type and features" | 7 | menu "Host processor type and features" |
8 | 8 | ||
9 | config CMPXCHG_DOUBLE | ||
10 | bool | ||
11 | default n | ||
12 | |||
13 | source "arch/x86/Kconfig.cpu" | 9 | source "arch/x86/Kconfig.cpu" |
14 | 10 | ||
15 | endmenu | 11 | endmenu |