diff --git a/[refs] b/[refs]
index 1c6602ace517..76310434e2a7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ea3acb199a5d7e4da1de0a4288eba993b29f33b9
+refs/heads/master: 4701472e441e41be2549a25228f703bc9cd13b5b
diff --git a/trunk/arch/x86/Kconfig b/trunk/arch/x86/Kconfig
index 8da93745c087..c876bace8fdc 100644
--- a/trunk/arch/x86/Kconfig
+++ b/trunk/arch/x86/Kconfig
@@ -86,10 +86,6 @@ config STACKTRACE_SUPPORT
 config HAVE_LATENCYTOP_SUPPORT
 	def_bool y
 
-config FAST_CMPXCHG_LOCAL
-	bool
-	default y
-
 config MMU
 	def_bool y