aboutsummaryrefslogtreecommitdiffstats
path: root/mm/Kconfig
diff options
context:
space:
mode:
Diffstat (limited to 'mm/Kconfig')
-rw-r--r--mm/Kconfig4
1 files changed, 2 insertions, 2 deletions
diff --git a/mm/Kconfig b/mm/Kconfig
index 86187221e78f..e24d348083c3 100644
--- a/mm/Kconfig
+++ b/mm/Kconfig
@@ -116,11 +116,11 @@ config SPARSEMEM_EXTREME
116config MEMORY_HOTPLUG 116config MEMORY_HOTPLUG
117 bool "Allow for memory hot-add" 117 bool "Allow for memory hot-add"
118 depends on SPARSEMEM || X86_64_ACPI_NUMA 118 depends on SPARSEMEM || X86_64_ACPI_NUMA
119 depends on HOTPLUG && !SOFTWARE_SUSPEND && ARCH_ENABLE_MEMORY_HOTPLUG 119 depends on HOTPLUG && !HIBERNATION && ARCH_ENABLE_MEMORY_HOTPLUG
120 depends on (IA64 || X86 || PPC64 || SUPERH) 120 depends on (IA64 || X86 || PPC64 || SUPERH)
121 121
122comment "Memory hotplug is currently incompatible with Software Suspend" 122comment "Memory hotplug is currently incompatible with Software Suspend"
123 depends on SPARSEMEM && HOTPLUG && SOFTWARE_SUSPEND 123 depends on SPARSEMEM && HOTPLUG && HIBERNATION
124 124
125config MEMORY_HOTPLUG_SPARSE 125config MEMORY_HOTPLUG_SPARSE
126 def_bool y 126 def_bool y