diff --git a/[refs] b/[refs]
index c9ddf23d02fc..5962bdb9967a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 47af5518526d435d0d56a329a578f240e86eb678
+refs/heads/master: 74f8f557fd0c6f32e17e78c9ef508ca66ef37d3a
diff --git a/trunk/arch/s390/Kconfig b/trunk/arch/s390/Kconfig
index 5b04c4095c8d..583d9ff0a571 100644
--- a/trunk/arch/s390/Kconfig
+++ b/trunk/arch/s390/Kconfig
@@ -178,7 +178,7 @@ config PACK_STACK
 
 config SMALL_STACK
 	bool "Use 4kb/8kb for kernel stack instead of 8kb/16kb"
-	depends on PACK_STACK
+	depends on PACK_STACK && !LOCKDEP
 	help
 	  If you say Y here and the compiler supports the -mkernel-backchain
 	  option the kernel will use a smaller kernel stack size. For 31 bit