Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

[linux-2.6-block.git] / lib / Kconfig.debug

diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index 60d09e9e8e8b7ad5b11a55c033223d3651178372..eed9987bceb92b773777350396155f3652f2e6e9 100644 (file)
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -1442,6 +1442,19 @@ config DEBUG_BLOCK_EXT_DEVT
 
          Say N if you are unsure.
 
+config CPU_HOTPLUG_STATE_CONTROL
+       bool "Enable CPU hotplug state control"
+       depends on DEBUG_KERNEL
+       depends on HOTPLUG_CPU
+       default n
+       help
+         Allows to write steps between "offline" and "online" to the CPUs
+         sysfs target file so states can be stepped granular. This is a debug
+         option for now as the hotplug machinery cannot be stopped and
+         restarted at arbitrary points yet.
+
+         Say N if your are unsure.
+
 config NOTIFIER_ERROR_INJECTION
        tristate "Notifier error injection"
        depends on DEBUG_KERNEL