From 24627adbfb2fad4f59d7e86497460b98c6e4ca6e Mon Sep 17 00:00:00 2001
From: Heiko Carstens <heiko.carstens@de.ibm.com>
Date: Thu, 12 Jan 2012 17:17:30 -0800
Subject: [PATCH] --- yaml --- r: 284352 b: refs/heads/master c:
 4156153c4daddf12dd386016f96a947a01e93bf4 h: refs/heads/master v: v3

---
 [refs]                     | 2 +-
 trunk/arch/Kconfig         | 3 +++
 trunk/arch/x86/Kconfig     | 1 +
 trunk/arch/x86/Kconfig.cpu | 3 ---
 trunk/arch/x86/um/Kconfig  | 4 ----
 trunk/mm/vmstat.c          | 2 +-
 6 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index 8f5b9ffb4d86..32dd7b44a409 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 43570fd2f47ba518145e9289f54cde3dba4c8b25
+refs/heads/master: 4156153c4daddf12dd386016f96a947a01e93bf4
diff --git a/trunk/arch/Kconfig b/trunk/arch/Kconfig
index a2c5c077c32d..22182a8cc62c 100644
--- a/trunk/arch/Kconfig
+++ b/trunk/arch/Kconfig
@@ -193,4 +193,7 @@ config HAVE_ALIGNED_STRUCT_PAGE
 	  on a struct page for better performance. However selecting this
 	  might increase the size of a struct page by a word.
 
+config HAVE_CMPXCHG_LOCAL
+	bool
+
 source "kernel/gcov/Kconfig"
diff --git a/trunk/arch/x86/Kconfig b/trunk/arch/x86/Kconfig
index 5201a2c27239..59717fd17bc7 100644
--- a/trunk/arch/x86/Kconfig
+++ b/trunk/arch/x86/Kconfig
@@ -61,6 +61,7 @@ config X86
 	select HAVE_PERF_EVENTS_NMI
 	select ANON_INODES
 	select HAVE_ALIGNED_STRUCT_PAGE if SLUB && !M386
+	select HAVE_CMPXCHG_LOCAL if !M386
 	select HAVE_ARCH_KMEMCHECK
 	select HAVE_USER_RETURN_NOTIFIER
 	select ARCH_BINFMT_ELF_RANDOMIZE_PIE
diff --git a/trunk/arch/x86/Kconfig.cpu b/trunk/arch/x86/Kconfig.cpu
index e3ca7e0d858c..99d2ab8b7795 100644
--- a/trunk/arch/x86/Kconfig.cpu
+++ b/trunk/arch/x86/Kconfig.cpu
@@ -309,9 +309,6 @@ 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 CMPXCHG_DOUBLE
 	def_bool y
 
diff --git a/trunk/arch/x86/um/Kconfig b/trunk/arch/x86/um/Kconfig
index 1d97bd84b6fb..a62bfc66239e 100644
--- a/trunk/arch/x86/um/Kconfig
+++ b/trunk/arch/x86/um/Kconfig
@@ -6,10 +6,6 @@ menu "UML-specific options"
 
 menu "Host processor type and features"
 
-config CMPXCHG_LOCAL
-	bool
-	default n
-
 config CMPXCHG_DOUBLE
 	bool
 	default n
diff --git a/trunk/mm/vmstat.c b/trunk/mm/vmstat.c
index 8fd603b1665e..f600557a7659 100644
--- a/trunk/mm/vmstat.c
+++ b/trunk/mm/vmstat.c
@@ -295,7 +295,7 @@ void __dec_zone_page_state(struct page *page, enum zone_stat_item item)
 }
 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
  * that comes with local_irq_save/restore if we use this_cpu_cmpxchg.