Merge commit 'v2.6.28-rc8' into x86/doc

[sfrench/cifs-2.6.git] / arch / s390 / Kconfig

diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
index 70b7645ce745aa03863360201183a832aec3f130..8116a3328a19dd9b0cc79bbc3cd5b32a10e0234a 100644 (file)
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@ -241,19 +241,17 @@ config PACK_STACK
          Say Y if you are unsure.
 
 config SMALL_STACK
-       bool "Use 4kb/8kb for kernel stack instead of 8kb/16kb"
-       depends on PACK_STACK && !LOCKDEP
+       bool "Use 8kb for kernel stack instead of 16kb"
+       depends on PACK_STACK && 64BIT && !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
-         the reduced size is 4kb instead of 8kb and for 64 bit it is 8kb
-         instead of 16kb. This allows to run more thread on a system and
-         reduces the pressure on the memory management for higher order
-         page allocations.
+         option the kernel will use a smaller kernel stack size. The reduced
+         size is 8kb instead of 16kb. This allows to run more threads on a
+         system and reduces the pressure on the memory management for higher
+         order page allocations.
 
          Say N if you are unsure.
 
-
 config CHECK_STACK
        bool "Detect kernel stack overflow"
        help
@@ -384,7 +382,7 @@ config IPL
 choice
        prompt "IPL method generated into head.S"
        depends on IPL
-       default IPL_TAPE
+       default IPL_VM
        help
          Select "tape" if you want to IPL the image from a Tape.