[GFS2] Fix up merge of Linus' kernel into GFS2

[pandora-kernel.git] / arch / s390 / Kconfig

diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
index 6fe532d..b216ca6 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
 


@@ -14,6 +22,10 @@ config RWSEM_XCHGADD_ALGORITHM
        bool
        default y
 
        bool
        default y
 

+config GENERIC_HWEIGHT
+       bool
+       default y
+

 config GENERIC_CALIBRATE_DELAY
        bool
        default y
 config GENERIC_CALIBRATE_DELAY
        bool
        default y


@@ -27,11 +39,6 @@ config S390
        bool
        default y
 
        bool
        default y
 

-config UID16
-       bool
-       default y
-       depends on !64BIT
-

 source "init/Kconfig"
 
 menu "Base setup"
 source "init/Kconfig"
 
 menu "Base setup"


@@ -85,6 +92,10 @@ config HOTPLUG_CPU
          can be controlled through /sys/devices/system/cpu/cpu#.
          Say N if you want to disable CPU hotplug.
 
          can be controlled through /sys/devices/system/cpu/cpu#.
          Say N if you want to disable CPU hotplug.
 

+config DEFAULT_MIGRATION_COST
+       int
+       default "1000000"
+

 config MATHEMU
        bool "IEEE FPU emulation"
        depends on MARCH_G5
 config MATHEMU
        bool "IEEE FPU emulation"
        depends on MARCH_G5


@@ -107,12 +118,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"
 


@@ -443,9 +451,16 @@ 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
 config KEXEC

-       bool "kexec system call (EXPERIMENTAL)"
-       depends on EXPERIMENTAL
+       bool "kexec system call"

        help
          kexec is a system call that implements the ability to shutdown your
          current kernel, and to start another kernel.  It is like a reboot
        help
          kexec is a system call that implements the ability to shutdown your
          current kernel, and to start another kernel.  It is like a reboot


@@ -461,6 +476,8 @@ config PCMCIA
 
 source "drivers/base/Kconfig"
 
 
 source "drivers/base/Kconfig"
 

+source "drivers/connector/Kconfig"
+

 source "drivers/scsi/Kconfig"
 
 source "drivers/s390/Kconfig"
 source "drivers/scsi/Kconfig"
 
 source "drivers/s390/Kconfig"


@@ -469,8 +486,22 @@ source "drivers/net/Kconfig"
 
 source "fs/Kconfig"
 
 
 source "fs/Kconfig"
 

+menu "Instrumentation Support"
+

 source "arch/s390/oprofile/Kconfig"
 
 source "arch/s390/oprofile/Kconfig"
 

+config KPROBES
+       bool "Kprobes (EXPERIMENTAL)"
+       depends on EXPERIMENTAL && MODULES
+       help
+         Kprobes allows you to trap at almost any kernel address and
+         execute a callback function.  register_kprobe() establishes
+         a probepoint and specifies the callback.  Kprobes is useful
+         for kernel debugging, non-intrusive instrumentation and testing.
+         If in doubt, say "N".
+
+endmenu
+

 source "arch/s390/Kconfig.debug"
 
 source "security/Kconfig"
 source "arch/s390/Kconfig.debug"
 
 source "security/Kconfig"