diff options
-rw-r--r-- | arch/i386/Kconfig | 2 | ||||
-rw-r--r-- | arch/x86_64/Kconfig | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/arch/i386/Kconfig b/arch/i386/Kconfig index c2d54b802232..8770a5d0b143 100644 --- a/arch/i386/Kconfig +++ b/arch/i386/Kconfig | |||
@@ -891,7 +891,7 @@ config PHYSICAL_ALIGN | |||
891 | Don't change this unless you know what you are doing. | 891 | Don't change this unless you know what you are doing. |
892 | 892 | ||
893 | config HOTPLUG_CPU | 893 | config HOTPLUG_CPU |
894 | bool "Support for hot-pluggable CPUs (EXPERIMENTAL)" | 894 | bool "Support for suspend on SMP and hot-pluggable CPUs (EXPERIMENTAL)" |
895 | depends on SMP && HOTPLUG && EXPERIMENTAL && !X86_VOYAGER | 895 | depends on SMP && HOTPLUG && EXPERIMENTAL && !X86_VOYAGER |
896 | ---help--- | 896 | ---help--- |
897 | Say Y here to experiment with turning CPUs off and on, and to | 897 | Say Y here to experiment with turning CPUs off and on, and to |
diff --git a/arch/x86_64/Kconfig b/arch/x86_64/Kconfig index 145bb824b2a8..5ce94430c019 100644 --- a/arch/x86_64/Kconfig +++ b/arch/x86_64/Kconfig | |||
@@ -428,12 +428,15 @@ config NR_CPUS | |||
428 | memory in the static kernel configuration. | 428 | memory in the static kernel configuration. |
429 | 429 | ||
430 | config HOTPLUG_CPU | 430 | config HOTPLUG_CPU |
431 | bool "Support for hot-pluggable CPUs (EXPERIMENTAL)" | 431 | bool "Support for suspend on SMP and hot-pluggable CPUs (EXPERIMENTAL)" |
432 | depends on SMP && HOTPLUG && EXPERIMENTAL | 432 | depends on SMP && HOTPLUG && EXPERIMENTAL |
433 | help | 433 | help |
434 | Say Y here to experiment with turning CPUs off and on. CPUs | 434 | Say Y here to experiment with turning CPUs off and on. CPUs |
435 | can be controlled through /sys/devices/system/cpu/cpu#. | 435 | can be controlled through /sys/devices/system/cpu/cpu#. |
436 | Say N if you want to disable CPU hotplug. | 436 | This is also required for suspend/hibernation on SMP systems. |
437 | |||
438 | Say N if you want to disable CPU hotplug and don't need to | ||
439 | suspend. | ||
437 | 440 | ||
438 | config ARCH_ENABLE_MEMORY_HOTPLUG | 441 | config ARCH_ENABLE_MEMORY_HOTPLUG |
439 | def_bool y | 442 | def_bool y |