Merge to Fedora kernel-2.6.7-1.492

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

diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
index c0b72b4..d4b47a6 100644 (file)
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@ -67,9 +67,9 @@ config MARCH_Z900
          on older 31 bit only CPUs.
 
 config MARCH_Z990
-       bool "IBM eServer zSeries model z990"
+       bool "IBM eServer zSeries model z890 and z990"
        help
-         Select this enable optimizations for model z990.
+         Select this enable optimizations for model z890/z990.
          This will be slightly faster but does not work on
          older machines such as the z900.
 
@@ -107,6 +107,15 @@ config NR_CPUS
          This is purely to save memory - each supported CPU adds
          approximately sixteen kilobytes to the kernel image.
 
+config HOTPLUG_CPU
+       bool "Support for hot-pluggable CPUs (EXPERIMENTAL)"
+       depends on SMP && HOTPLUG && EXPERIMENTAL
+       default n
+       help
+         Say Y here to experiment with turning CPUs off and on.  CPUs
+         can be controlled through /sys/devices/system/cpu/cpu#.
+         Say N if you want to disable CPU hotplug.
+
 config MATHEMU
        bool "IEEE FPU emulation"
        depends on MARCH_G5
@@ -154,7 +163,7 @@ 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, z900 and z990).
+         IBM S/390 (G5 and G6) and eServer zSeries (z800, z890, z900 and z990).
 
          For details please refer to the documentation provided by IBM at
          <http://www10.software.ibm.com/developerworks/opensource/linux390>