diff --git a/[refs] b/[refs]
index 7188c1b95945..467ff525fdbc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8c0933eeb701eb8f526d88b1915af7bb35748e7b
+refs/heads/master: b6b40c532a36f91df9c21caf9baba3b635e99d4e
diff --git a/trunk/arch/s390/Kconfig b/trunk/arch/s390/Kconfig
index 82cbffd03654..f0e7ccf1b206 100644
--- a/trunk/arch/s390/Kconfig
+++ b/trunk/arch/s390/Kconfig
@@ -47,6 +47,11 @@ config NO_IOMEM
 config NO_DMA
 	def_bool y
 
+config GENERIC_LOCKBREAK
+	bool
+	default y
+	depends on SMP && PREEMPT
+
 mainmenu "Linux Kernel Configuration"
 
 config S390