[PATCH] memory hotplug: sysfs and add/remove functions

[linux-2.6-omap-h63xx.git] / mm / Kconfig

diff --git a/mm/Kconfig b/mm/Kconfig
index f35a550ba4b92f9749fee63d57e1f5708adc1dc6..1a4473fcb2ca0d2ea163301ba49d740d78310e8b 100644 (file)
--- a/mm/Kconfig
+++ b/mm/Kconfig
@@ -112,6 +112,14 @@ config SPARSEMEM_EXTREME
        def_bool y
        depends on SPARSEMEM && !SPARSEMEM_STATIC
 
+# eventually, we can have this option just 'select SPARSEMEM'
+config MEMORY_HOTPLUG
+       bool "Allow for memory hot-add"
+       depends on SPARSEMEM && HOTPLUG && !SOFTWARE_SUSPEND
+
+comment "Memory hotplug is currently incompatible with Software Suspend"
+       depends on SPARSEMEM && HOTPLUG && SOFTWARE_SUSPEND
+
 # Heavily threaded applications may benefit from splitting the mm-wide
 # page_table_lock, so that faults on different parts of the user address
 # space can be handled with less contention: split it at this NR_CPUS.