summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorDimitri Sivanich <sivanich@sgi.com>2008-08-11 17:46:46 +0200
committerIngo Molnar <mingo@elte.hu>2008-08-11 18:29:56 +0200
commit7c13e6a3d15a4ebcc3f40df5f4d19665479f8ca3 (patch)
treef428a2a6d91b09c96d5f3d6a09d0f93666aee7eb /arch
parentMerge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/c... (diff)
downloadlinux-7c13e6a3d15a4ebcc3f40df5f4d19665479f8ca3.tar.xz
linux-7c13e6a3d15a4ebcc3f40df5f4d19665479f8ca3.zip
x86: remove EXPERIMENTAL restriction from CONFIG_HOTPLUG_CPU
This removes the EXPERIMENTAL restriction from CONFIG_HOTPLUG_CPU on the x86 architecture. Signed-off-by: Dimitri Sivanich <sivanich@sgi.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/Kconfig14
1 files changed, 7 insertions, 7 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 3d0f2b6a5a16..7917962ab7ff 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -1371,14 +1371,14 @@ config PHYSICAL_ALIGN
Don't change this unless you know what you are doing.
config HOTPLUG_CPU
- bool "Support for suspend on SMP and hot-pluggable CPUs (EXPERIMENTAL)"
- depends on SMP && HOTPLUG && EXPERIMENTAL && !X86_VOYAGER
+ bool "Support for hot-pluggable CPUs"
+ depends on SMP && HOTPLUG && !X86_VOYAGER
---help---
- Say Y here to experiment with turning CPUs off and on, and to
- enable suspend on SMP systems. CPUs can be controlled through
- /sys/devices/system/cpu.
- Say N if you want to disable CPU hotplug and don't need to
- suspend.
+ Say Y here to allow turning CPUs off and on. CPUs can be
+ controlled through /sys/devices/system/cpu.
+ ( Note: power management support will enable this option
+ automatically on SMP systems. )
+ Say N if you want to disable CPU hotplug.
config COMPAT_VDSO
def_bool y