Commit 4156153c4daddf12dd386016f96a947a01e93bf4

Authored by Heiko Carstens
Committed by Linus Torvalds
1 parent 43570fd2f4

mm,x86,um: move CMPXCHG_LOCAL config option

Move CMPXCHG_LOCAL and rename it to HAVE_CMPXCHG_LOCAL 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>

Showing 5 changed files with 5 additions and 8 deletions Side-by-side Diff

... ... @@ -193,5 +193,8 @@
193 193 on a struct page for better performance. However selecting this
194 194 might increase the size of a struct page by a word.
195 195  
  196 +config HAVE_CMPXCHG_LOCAL
  197 + bool
  198 +
196 199 source "kernel/gcov/Kconfig"
... ... @@ -61,6 +61,7 @@
61 61 select HAVE_PERF_EVENTS_NMI
62 62 select ANON_INODES
63 63 select HAVE_ALIGNED_STRUCT_PAGE if SLUB && !M386
  64 + select HAVE_CMPXCHG_LOCAL if !M386
64 65 select HAVE_ARCH_KMEMCHECK
65 66 select HAVE_USER_RETURN_NOTIFIER
66 67 select ARCH_BINFMT_ELF_RANDOMIZE_PIE
arch/x86/Kconfig.cpu
... ... @@ -309,9 +309,6 @@
309 309 config X86_CMPXCHG
310 310 def_bool X86_64 || (X86_32 && !M386)
311 311  
312   -config CMPXCHG_LOCAL
313   - def_bool X86_64 || (X86_32 && !M386)
314   -
315 312 config CMPXCHG_DOUBLE
316 313 def_bool y
317 314  
... ... @@ -6,10 +6,6 @@
6 6  
7 7 menu "Host processor type and features"
8 8  
9   -config CMPXCHG_LOCAL
10   - bool
11   - default n
12   -
13 9 config CMPXCHG_DOUBLE
14 10 bool
15 11 default n
... ... @@ -295,7 +295,7 @@
295 295 }
296 296 EXPORT_SYMBOL(__dec_zone_page_state);
297 297  
298   -#ifdef CONFIG_CMPXCHG_LOCAL
  298 +#ifdef CONFIG_HAVE_CMPXCHG_LOCAL
299 299 /*
300 300 * If we have cmpxchg_local support then we do not need to incur the overhead
301 301 * that comes with local_irq_save/restore if we use this_cpu_cmpxchg.