X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=arch%2Fs390%2FKconfig;h=583d9ff0a571a4c75a1370472e9c03ff7333a076;hb=12472b4165a21f5415ff4f60f8f46311a6b7b9ac;hp=f900a516f099bfc6724068af74b77d6149625cf0;hpb=e993835441734c184d70d3716eed78a08eeb71c2;p=linux-2.6

diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
index f900a516f0..583d9ff0a5 100644
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@ -30,8 +30,8 @@ config GENERIC_CALIBRATE_DELAY
 	bool
 	default y
 
-config GENERIC_BUST_SPINLOCK
-	bool
+config GENERIC_TIME
+	def_bool y
 
 mainmenu "Linux Kernel Configuration"
 
@@ -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