Merge branch 'viafb-next' of git://github.com/schandinat/linux-2.6

[cascardo/linux.git] / arch / s390 / Kconfig

diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
index 636bcb8..2508a6f 100644 (file)
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@ -85,6 +85,7 @@ config S390
        select HAVE_KERNEL_BZIP2
        select HAVE_KERNEL_LZMA
        select HAVE_KERNEL_LZO
+       select HAVE_KERNEL_XZ
        select HAVE_GET_USER_PAGES_FAST
        select HAVE_ARCH_MUTEX_CPU_RELAX
        select ARCH_INLINE_SPIN_TRYLOCK
@@ -341,26 +342,16 @@ config STACK_GUARD
          The minimum size for the stack guard should be 256 for 31 bit and
          512 for 64 bit.
 
-config WARN_STACK
+config WARN_DYNAMIC_STACK
        def_bool n
-       prompt "Emit compiler warnings for function with broken stack usage"
+       prompt "Emit compiler warnings for function with dynamic stack usage"
        help
-         This option enables the compiler options -mwarn-framesize and
-         -mwarn-dynamicstack. If the compiler supports these options it
-         will generate warnings for function which either use alloca or
-         create a stack frame bigger than CONFIG_WARN_STACK_SIZE.
+         This option enables the compiler option -mwarn-dynamicstack. If the
+         compiler supports this options generates warnings for functions
+         that dynamically allocate stack space using alloca.
 
          Say N if you are unsure.
 
-config WARN_STACK_SIZE
-       int "Maximum frame size considered safe (128-2048)"
-       range 128 2048
-       depends on WARN_STACK
-       default "2048"
-       help
-         This allows you to specify the maximum frame size a function may
-         have without the compiler complaining about it.
-
 config ARCH_POPULATES_NODE_MAP
        def_bool y