diff --git a/[refs] b/[refs]
index 70c2f6b916db..4fe4bb947768 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2030c0fd3db3332378f95f479c286181e3920644
+refs/heads/master: 3013449243adc3421b507696e5d247a3d292ee0c
diff --git a/trunk/arch/um/Kconfig.i386 b/trunk/arch/um/Kconfig.i386
index 8ad156a00499..5d92cacd56c6 100644
--- a/trunk/arch/um/Kconfig.i386
+++ b/trunk/arch/um/Kconfig.i386
@@ -42,3 +42,7 @@ config ARCH_HAS_SC_SIGNALS
 config ARCH_REUSE_HOST_VSYSCALL_AREA
 	bool
 	default y
+
+config X86_CMPXCHG
+	bool
+	default y
diff --git a/trunk/include/asm-um/system-i386.h b/trunk/include/asm-um/system-i386.h
index ea8381de3cc9..c436263e67ba 100644
--- a/trunk/include/asm-um/system-i386.h
+++ b/trunk/include/asm-um/system-i386.h
@@ -3,6 +3,4 @@
 
 #include "asm/system-generic.h"
     
-#define __HAVE_ARCH_CMPXCHG 1
-
 #endif