diff --git a/[refs] b/[refs]
index 5b44ec3601f6..e6298dccb19e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c37e108d156101dcde7ec7033eabe7abe83366bc
+refs/heads/master: dea20a3fbdd08e5ae2a0b33d2577c794a3764a11
diff --git a/trunk/lib/Kconfig.debug b/trunk/lib/Kconfig.debug
index 756a908c441d..2d7cb0d04fc8 100644
--- a/trunk/lib/Kconfig.debug
+++ b/trunk/lib/Kconfig.debug
@@ -71,7 +71,7 @@ config LOG_BUF_SHIFT
 
 config DETECT_SOFTLOCKUP
 	bool "Detect Soft Lockups"
-	depends on DEBUG_KERNEL
+	depends on DEBUG_KERNEL && !S390
 	default y
 	help
 	  Say Y here to enable the kernel to detect "soft lockups",