diff --git a/[refs] b/[refs]
index dd3a72991c04..84a94d4f851b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0d6617c7732c083659566117ca620eda6f1a87af
+refs/heads/master: e5f0bdc7840bdb791247cb98dfc1dab6ea6c7da4
diff --git a/trunk/arch/um/Kconfig.x86 b/trunk/arch/um/Kconfig.x86
index d31ecf346b4e..21bebe63df66 100644
--- a/trunk/arch/um/Kconfig.x86
+++ b/trunk/arch/um/Kconfig.x86
@@ -10,6 +10,10 @@ config CMPXCHG_LOCAL
 	bool
 	default n
 
+config CMPXCHG_DOUBLE
+	bool
+	default n
+
 source "arch/x86/Kconfig.cpu"
 
 endmenu