Merge branches 'release' and 'throttling-domains' into release

[linux-2.6] / arch / s390 / Kconfig

diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
index eaaac3788110ec90ad076dc92d922da452675242..92a4f7b4323a54e0f23453e714e0a7c714bab632 100644 (file)
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@ -4,27 +4,26 @@
 #
 
 config MMU
-       bool
-       default y
+       def_bool y
 
 config ZONE_DMA
-       bool
-       default y
+       def_bool y
+       depends on 64BIT
 
 config LOCKDEP_SUPPORT
-       bool
-       default y
+       def_bool y
 
 config STACKTRACE_SUPPORT
-       bool
-       default y
+       def_bool y
+
+config HAVE_LATENCYTOP_SUPPORT
+       def_bool y
 
 config RWSEM_GENERIC_SPINLOCK
        bool
 
 config RWSEM_XCHGADD_ALGORITHM
-       bool
-       default y
+       def_bool y
 
 config ARCH_HAS_ILOG2_U32
        bool
@@ -35,20 +34,33 @@ config ARCH_HAS_ILOG2_U64
        default n
 
 config GENERIC_HWEIGHT
-       bool
-       default y
+       def_bool y
 
 config GENERIC_TIME
        def_bool y
 
+config GENERIC_BUG
+       bool
+       depends on BUG
+       default y
+
 config NO_IOMEM
        def_bool y
 
-mainmenu "Linux Kernel Configuration"
+config NO_DMA
+       def_bool y
 
-config S390
+config GENERIC_LOCKBREAK
        bool
        default y
+       depends on SMP && PREEMPT
+
+mainmenu "Linux Kernel Configuration"
+
+config S390
+       def_bool y
+       select HAVE_OPROFILE
+       select HAVE_KPROBES
 
 source "init/Kconfig"
 
@@ -79,8 +91,8 @@ config SMP
          singleprocessor machines. On a singleprocessor machine, the kernel
          will run faster if you say N here.
 
-         See also the <file:Documentation/smp.txt> and the SMP-HOWTO
-         available at <http://www.tldp.org/docs.html#howto>.
+         See also the SMP-HOWTO available at
+         <http://www.tldp.org/docs.html#howto>.
 
          Even if you don't know what to do here, say Y.
 
@@ -107,10 +119,6 @@ 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
@@ -272,10 +280,11 @@ config WARN_STACK_SIZE
 config ARCH_POPULATES_NODE_MAP
        def_bool y
 
-source "mm/Kconfig"
+comment "Kernel preemption"
 
-config HOLES_IN_ZONE
-       def_bool y
+source "kernel/Kconfig.preempt"
+
+source "mm/Kconfig"
 
 comment "I/O subsystem configuration"
 
@@ -312,17 +321,6 @@ config QDIO_DEBUG
 
 comment "Misc"
 
-config PREEMPT
-       bool "Preemptible Kernel"
-       help
-         This option reduces the latency of the kernel when reacting to
-         real-time or interactive events by allowing a low priority process to
-         be preempted even if it is in kernel mode executing a system call.
-         This allows applications to run more reliably even when the system is
-         under load.
-
-         Say N if you are unsure.
-
 config IPL
        bool "Builtin IPL record support"
        help
@@ -376,6 +374,8 @@ config SHARED_KERNEL
          Select this option, if you want to share the text segment of the
          Linux kernel between different VM guests. This reduces memory
          usage with lots of guests but greatly increases kernel size.
+         Also if a kernel was IPL'ed from a shared segment the kexec system
+         call will not work.
          You should only select this option if you know what you are
          doing and want to exploit this feature.
 
@@ -478,6 +478,8 @@ config APPLDATA_NET_SUM
          This can also be compiled as a module, which will be called
          appldata_net_sum.o.
 
+source kernel/Kconfig.hz
+
 config NO_IDLE_HZ
        bool "No HZ timer ticks in idle"
        help
@@ -512,42 +514,28 @@ config KEXEC
          current kernel, and to start another kernel.  It is like a reboot
          but is independent of hardware/microcode support.
 
+config ZFCPDUMP
+       tristate "zfcpdump support"
+       select SMP
+       default n
+       help
+         Select this option if you want to build an zfcpdump enabled kernel.
+         Refer to <file:Documentation/s390/zfcpdump.txt> for more details on this.
+
 endmenu
 
 source "net/Kconfig"
 
 config PCMCIA
-       bool
-       default n
-
-source "drivers/base/Kconfig"
-
-source "drivers/connector/Kconfig"
-
-source "drivers/scsi/Kconfig"
+       def_bool n
 
-source "drivers/s390/Kconfig"
+config CCW
+       def_bool y
 
-source "drivers/net/Kconfig"
+source "drivers/Kconfig"
 
 source "fs/Kconfig"
 
-menu "Instrumentation Support"
-
-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"