X-Git-Url: http://pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=arch%2Fs390%2FKconfig;h=583d9ff0a571a4c75a1370472e9c03ff7333a076;hb=1c1afa3c053d4ccdf44e5a4e159005cdfd48bfc6;hp=b216ca659cdff5876e8cbb8f04be03395fc03cc3;hpb=02b25fcff676125a88169c8a78d4c6dd647574ed;p=linux-2.6-omap-h63xx.git

diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
index b216ca659cd..583d9ff0a57 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"
 
@@ -51,6 +51,10 @@ config 64BIT
 	  Select this option if you have a 64 bit IBM zSeries machine
 	  and want to use the 64 bit addressing mode.
 
+config 32BIT
+	bool
+	default y if !64BIT
+
 config SMP
 	bool "Symmetric multi-processing support"
 	---help---
@@ -149,6 +153,14 @@ config MARCH_Z990
 	  This will be slightly faster but does not work on
 	  older machines such as the z900.
 
+config MARCH_Z9_109
+	bool "IBM System z9"
+	help
+	  Select this to enable optimizations for IBM System z9-109, IBM
+	  System z9 Enterprise Class (z9 EC), and IBM System z9 Business
+	  Class (z9 BC). The kernel will be slightly faster but will not
+	  work on older machines such as the z990, z890, z900, and z800.
+
 endchoice
 
 config PACK_STACK
@@ -166,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