From 8a10527b713ca27672f287bc5aa0a59a40808a9e Mon Sep 17 00:00:00 2001 From: Stefan Richter Date: Wed, 23 May 2007 13:58:08 -0700 Subject: [PATCH] --- yaml --- r: 56908 b: refs/heads/master c: 1dbf37e8adf1ab6b82a510d5e69fa676ed9717c4 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/i386/Kconfig | 2 +- trunk/arch/x86_64/Kconfig | 7 +++++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 89bf7e546283..a2048865f870 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 82cd0e8410ae74d3fd39d168049381eafc489e5b +refs/heads/master: 1dbf37e8adf1ab6b82a510d5e69fa676ed9717c4 diff --git a/trunk/arch/i386/Kconfig b/trunk/arch/i386/Kconfig index c2d54b802232..8770a5d0b143 100644 --- a/trunk/arch/i386/Kconfig +++ b/trunk/arch/i386/Kconfig @@ -891,7 +891,7 @@ config PHYSICAL_ALIGN Don't change this unless you know what you are doing. config HOTPLUG_CPU - bool "Support for hot-pluggable CPUs (EXPERIMENTAL)" + bool "Support for suspend on SMP and hot-pluggable CPUs (EXPERIMENTAL)" depends on SMP && HOTPLUG && EXPERIMENTAL && !X86_VOYAGER ---help--- Say Y here to experiment with turning CPUs off and on, and to diff --git a/trunk/arch/x86_64/Kconfig b/trunk/arch/x86_64/Kconfig index 145bb824b2a8..5ce94430c019 100644 --- a/trunk/arch/x86_64/Kconfig +++ b/trunk/arch/x86_64/Kconfig @@ -428,12 +428,15 @@ config NR_CPUS memory in the static kernel configuration. config HOTPLUG_CPU - bool "Support for hot-pluggable CPUs (EXPERIMENTAL)" + bool "Support for suspend on SMP and hot-pluggable CPUs (EXPERIMENTAL)" depends on SMP && HOTPLUG && EXPERIMENTAL 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. + This is also required for suspend/hibernation on SMP systems. + + Say N if you want to disable CPU hotplug and don't need to + suspend. config ARCH_ENABLE_MEMORY_HOTPLUG def_bool y