diff --git a/[refs] b/[refs]
index 85a44cf41d1b..4f22ebb0c3cb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 12c247a6719987aad65f83158d2bb3e73c75c1f5
+refs/heads/master: f18edc95a37a901ffcbe91f5e05105f916a04fae
diff --git a/trunk/include/asm-x86/futex.h b/trunk/include/asm-x86/futex.h
index cd9f894dd2d7..c9952ea9f698 100644
--- a/trunk/include/asm-x86/futex.h
+++ b/trunk/include/asm-x86/futex.h
@@ -102,6 +102,13 @@ futex_atomic_op_inuser(int encoded_op, int __user *uaddr)
 static inline int
 futex_atomic_cmpxchg_inatomic(int __user *uaddr, int oldval, int newval)
 {
+
+#if defined(CONFIG_X86_32) && !defined(CONFIG_X86_BSWAP)
+	/* Real i386 machines have no cmpxchg instruction */
+	if (boot_cpu_data.x86 == 3)
+		return -ENOSYS;
+#endif
+
 	if (!access_ok(VERIFY_WRITE, uaddr, sizeof(int)))
 		return -EFAULT;