Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...

[linux-2.6.git] / arch / s390 / Kconfig

diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
index 1a9a6f1..46569b7 100644 (file)
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@ -7,6 +7,14 @@ config MMU
        bool
        default y
 
        bool
        default y
 

+config LOCKDEP_SUPPORT
+       bool
+       default y
+
+config STACKTRACE_SUPPORT
+       bool
+       default y
+

 config RWSEM_GENERIC_SPINLOCK
        bool
 
 config RWSEM_GENERIC_SPINLOCK
        bool
 


@@ -43,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.
 
          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---
 config SMP
        bool "Symmetric multi-processing support"
        ---help---


@@ -110,12 +122,9 @@ config SYSVIPC_COMPAT
        depends on COMPAT && SYSVIPC
        default y
 
        depends on COMPAT && SYSVIPC
        default y
 

-config BINFMT_ELF32
-       tristate "Kernel support for 31 bit ELF binaries"
-       depends on COMPAT
-       help
-         This allows you to run 32-bit Linux/ELF binaries on your zSeries
-         in 64 bit mode. Everybody wants this; say Y.
+config AUDIT_ARCH
+       bool
+       default y

 
 comment "Code generation options"
 
 
 comment "Code generation options"
 


@@ -446,6 +455,14 @@ config NO_IDLE_HZ_INIT
          The HZ timer is switched off in idle by default. That means the
          HZ timer is already disabled at boot time.
 
          The HZ timer is switched off in idle by default. That means the
          HZ timer is already disabled at boot time.
 

+config S390_HYPFS_FS
+       bool "s390 hypervisor file system support"
+       select SYS_HYPERVISOR
+       default y
+       help
+         This is a virtual file system intended to provide accounting
+         information in an s390 hypervisor environment.
+

 config KEXEC
        bool "kexec system call (EXPERIMENTAL)"
        depends on EXPERIMENTAL
 config KEXEC
        bool "kexec system call (EXPERIMENTAL)"
        depends on EXPERIMENTAL