|
@@ -115,7 +115,7 @@ config SPARSEMEM_EXTREME
|
|
# eventually, we can have this option just 'select SPARSEMEM'
|
|
# eventually, we can have this option just 'select SPARSEMEM'
|
|
config MEMORY_HOTPLUG
|
|
config MEMORY_HOTPLUG
|
|
bool "Allow for memory hot-add"
|
|
bool "Allow for memory hot-add"
|
|
- depends on SPARSEMEM && HOTPLUG && !SOFTWARE_SUSPEND
|
|
|
|
|
|
+ depends on SPARSEMEM && HOTPLUG && !SOFTWARE_SUSPEND && ARCH_ENABLE_MEMORY_HOTPLUG
|
|
depends on (IA64 || X86 || PPC64)
|
|
depends on (IA64 || X86 || PPC64)
|
|
|
|
|
|
comment "Memory hotplug is currently incompatible with Software Suspend"
|
|
comment "Memory hotplug is currently incompatible with Software Suspend"
|