aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/Kconfig
diff options
context:
space:
mode:
authorKees Cook <keescook@chromium.org>2013-01-22 16:01:19 -0500
committerIngo Molnar <mingo@kernel.org>2013-01-24 05:16:30 -0500
commit2c922cd07a0ada4d68e22453c972a5d77be8f20d (patch)
tree70676221f92aada08287b1876542648a6e964b9e /arch/x86/Kconfig
parentff7532ca2c631e7e96dcd305a967b610259dc0ea (diff)
x86/cpu/hotplug: Remove CONFIG_EXPERIMENTAL dependency
The CONFIG_EXPERIMENTAL config item has not carried much meaning for a while now and is almost always enabled by default. As agreed during the Linux kernel summit, remove it from any "depends on" lines in Kconfigs. Signed-off-by: Kees Cook <keescook@chromium.org> Cc: Fenghua Yu <fenghua.yu@intel.com> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Link: http://lkml.kernel.org/r/20130122210119.GA311@www.outflux.net Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/Kconfig')
-rw-r--r--arch/x86/Kconfig4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 79795af59810..2d621032525a 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -1699,7 +1699,7 @@ config HOTPLUG_CPU
1699config BOOTPARAM_HOTPLUG_CPU0 1699config BOOTPARAM_HOTPLUG_CPU0
1700 bool "Set default setting of cpu0_hotpluggable" 1700 bool "Set default setting of cpu0_hotpluggable"
1701 default n 1701 default n
1702 depends on HOTPLUG_CPU && EXPERIMENTAL 1702 depends on HOTPLUG_CPU
1703 ---help--- 1703 ---help---
1704 Set whether default state of cpu0_hotpluggable is on or off. 1704 Set whether default state of cpu0_hotpluggable is on or off.
1705 1705
@@ -1728,7 +1728,7 @@ config BOOTPARAM_HOTPLUG_CPU0
1728config DEBUG_HOTPLUG_CPU0 1728config DEBUG_HOTPLUG_CPU0
1729 def_bool n 1729 def_bool n
1730 prompt "Debug CPU0 hotplug" 1730 prompt "Debug CPU0 hotplug"
1731 depends on HOTPLUG_CPU && EXPERIMENTAL 1731 depends on HOTPLUG_CPU
1732 ---help--- 1732 ---help---
1733 Enabling this option offlines CPU0 (if CPU0 can be offlined) as 1733 Enabling this option offlines CPU0 (if CPU0 can be offlined) as
1734 soon as possible and boots up userspace with CPU0 offlined. User 1734 soon as possible and boots up userspace with CPU0 offlined. User