Commit 4156153c authored by Heiko Carstens's avatar Heiko Carstens Committed by Linus Torvalds

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: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
Acked-by: default avatarChristoph 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: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 43570fd2
...@@ -193,4 +193,7 @@ config HAVE_ALIGNED_STRUCT_PAGE ...@@ -193,4 +193,7 @@ config HAVE_ALIGNED_STRUCT_PAGE
on a struct page for better performance. However selecting this on a struct page for better performance. However selecting this
might increase the size of a struct page by a word. might increase the size of a struct page by a word.
config HAVE_CMPXCHG_LOCAL
bool
source "kernel/gcov/Kconfig" source "kernel/gcov/Kconfig"
...@@ -61,6 +61,7 @@ config X86 ...@@ -61,6 +61,7 @@ config X86
select HAVE_PERF_EVENTS_NMI select HAVE_PERF_EVENTS_NMI
select ANON_INODES select ANON_INODES
select HAVE_ALIGNED_STRUCT_PAGE if SLUB && !M386 select HAVE_ALIGNED_STRUCT_PAGE if SLUB && !M386
select HAVE_CMPXCHG_LOCAL if !M386
select HAVE_ARCH_KMEMCHECK select HAVE_ARCH_KMEMCHECK
select HAVE_USER_RETURN_NOTIFIER select HAVE_USER_RETURN_NOTIFIER
select ARCH_BINFMT_ELF_RANDOMIZE_PIE select ARCH_BINFMT_ELF_RANDOMIZE_PIE
......
...@@ -309,9 +309,6 @@ config X86_INTERNODE_CACHE_SHIFT ...@@ -309,9 +309,6 @@ config X86_INTERNODE_CACHE_SHIFT
config X86_CMPXCHG config X86_CMPXCHG
def_bool X86_64 || (X86_32 && !M386) def_bool X86_64 || (X86_32 && !M386)
config CMPXCHG_LOCAL
def_bool X86_64 || (X86_32 && !M386)
config CMPXCHG_DOUBLE config CMPXCHG_DOUBLE
def_bool y def_bool y
......
...@@ -6,10 +6,6 @@ menu "UML-specific options" ...@@ -6,10 +6,6 @@ menu "UML-specific options"
menu "Host processor type and features" menu "Host processor type and features"
config CMPXCHG_LOCAL
bool
default n
config CMPXCHG_DOUBLE config CMPXCHG_DOUBLE
bool bool
default n default n
......
...@@ -295,7 +295,7 @@ void __dec_zone_page_state(struct page *page, enum zone_stat_item item) ...@@ -295,7 +295,7 @@ void __dec_zone_page_state(struct page *page, enum zone_stat_item item)
} }
EXPORT_SYMBOL(__dec_zone_page_state); EXPORT_SYMBOL(__dec_zone_page_state);
#ifdef CONFIG_CMPXCHG_LOCAL #ifdef CONFIG_HAVE_CMPXCHG_LOCAL
/* /*
* If we have cmpxchg_local support then we do not need to incur the overhead * If we have cmpxchg_local support then we do not need to incur the overhead
* that comes with local_irq_save/restore if we use this_cpu_cmpxchg. * that comes with local_irq_save/restore if we use this_cpu_cmpxchg.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment