Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

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

diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
index 1dde860..1a9a6f1 100644 (file)
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@ -14,6 +14,10 @@ config RWSEM_XCHGADD_ALGORITHM
        bool
        default y
 
+config GENERIC_HWEIGHT
+       bool
+       default y
+
 config GENERIC_CALIBRATE_DELAY
        bool
        default y
@@ -23,35 +27,22 @@ config GENERIC_BUST_SPINLOCK
 
 mainmenu "Linux Kernel Configuration"
 
-config ARCH_S390
+config S390
        bool
        default y
 
-config UID16
-       bool
-       default y
-       depends on ARCH_S390X = 'n'
-
 source "init/Kconfig"
 
 menu "Base setup"
 
 comment "Processor type and features"
 
-config ARCH_S390X
+config 64BIT
        bool "64 bit kernel"
        help
          Select this option if you have a 64 bit IBM zSeries machine
          and want to use the 64 bit addressing mode.
 
-config 64BIT
-       def_bool ARCH_S390X
-
-config ARCH_S390_31
-       bool
-       depends on ARCH_S390X = 'n'
-       default y
-
 config SMP
        bool "Symmetric multi-processing support"
        ---help---
@@ -93,6 +84,10 @@ config HOTPLUG_CPU
          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
@@ -101,20 +96,15 @@ config MATHEMU
          on older S/390 machines. Say Y unless you know your machine doesn't
          need this.
 
-config S390_SUPPORT
+config COMPAT
        bool "Kernel support for 31 bit emulation"
-       depends on ARCH_S390X
+       depends on 64BIT
        help
          Select this option if you want to enable your system kernel to
          handle system-calls from ELF binaries for 31 bit ESA.  This option
          (and some other stuff like libraries and such) is needed for
          executing 31 bit applications.  It is safe to say "Y".
 
-config COMPAT
-       bool
-       depends on S390_SUPPORT
-       default y
-
 config SYSVIPC_COMPAT
        bool
        depends on COMPAT && SYSVIPC
@@ -122,7 +112,7 @@ config SYSVIPC_COMPAT
 
 config BINFMT_ELF32
        tristate "Kernel support for 31 bit ELF binaries"
-       depends on S390_SUPPORT
+       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.
@@ -135,7 +125,7 @@ choice
 
 config MARCH_G5
        bool "S/390 model G5 and G6"
-       depends on ARCH_S390_31
+       depends on !64BIT
        help
          Select this to build a 31 bit kernel that works
          on all S/390 and zSeries machines.
@@ -226,6 +216,8 @@ config WARN_STACK_SIZE
          This allows you to specify the maximum frame size a function may
          have without the compiler complaining about it.
 
+source "mm/Kconfig"
+
 comment "I/O subsystem configuration"
 
 config MACHCHK_WARNING
@@ -238,8 +230,8 @@ config MACHCHK_WARNING
 config QDIO
        tristate "QDIO support"
        ---help---
-         This driver provides the Queued Direct I/O base support for the
-         IBM S/390 (G5 and G6) and eServer zSeries (z800, z890, z900 and z990).
+         This driver provides the Queued Direct I/O base support for
+         IBM mainframes.
 
          For details please refer to the documentation provided by IBM at
          <http://www10.software.ibm.com/developerworks/opensource/linux390>
@@ -261,7 +253,8 @@ config QDIO_DEBUG
        bool "Extended debugging information"
        depends on QDIO
        help
-         Say Y here to get extended debugging output in /proc/s390dbf/qdio...
+         Say Y here to get extended debugging output in
+           /sys/kernel/debug/s390dbf/qdio...
          Warning: this option reduces the performance of the QDIO module.
 
          If unsure, say N.
@@ -453,19 +446,31 @@ 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.
 
+config KEXEC
+       bool "kexec system call (EXPERIMENTAL)"
+       depends on EXPERIMENTAL
+       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
+         but is independent of hardware/microcode support.
+
 endmenu
 
+source "net/Kconfig"
+
 config PCMCIA
        bool
        default n
 
 source "drivers/base/Kconfig"
 
+source "drivers/connector/Kconfig"
+
 source "drivers/scsi/Kconfig"
 
 source "drivers/s390/Kconfig"
 
-source "net/Kconfig"
+source "drivers/net/Kconfig"
 
 source "fs/Kconfig"