diff --git a/[refs] b/[refs]
index 9cb8167cc7a0..89f1bc667239 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 13abf8130139c2ccd4962a7e5a8902be5e6cb5a7
+refs/heads/master: 02edeb586ae4cdd17778923674700edb732a4741
diff --git a/trunk/arch/um/Kconfig b/trunk/arch/um/Kconfig
index d5e22f084880..684e1f8b2755 100644
--- a/trunk/arch/um/Kconfig
+++ b/trunk/arch/um/Kconfig
@@ -196,7 +196,7 @@ config HOST_2G_2G
 config SMP
 	bool "Symmetric multi-processing support (EXPERIMENTAL)"
 	default n
-	depends on MODE_TT && EXPERIMENTAL
+	depends on (MODE_TT && EXPERIMENTAL && !SMP_BROKEN) || (BROKEN && SMP_BROKEN)
 	help
 	This option enables UML SMP support.
 	It is NOT related to having a real SMP box. Not directly, at least.
diff --git a/trunk/arch/um/Kconfig.x86_64 b/trunk/arch/um/Kconfig.x86_64
index 6e5357c5bcfb..bd35e59419c8 100644
--- a/trunk/arch/um/Kconfig.x86_64
+++ b/trunk/arch/um/Kconfig.x86_64
@@ -37,3 +37,7 @@ config ARCH_HAS_SC_SIGNALS
 config ARCH_REUSE_HOST_VSYSCALL_AREA
 	bool
 	default n
+
+config SMP_BROKEN
+	bool
+	default y