diff options
Diffstat (limited to 'mm')
-rw-r--r-- | mm/Kconfig | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/mm/Kconfig b/mm/Kconfig index 8f5b45615f7b..5d88489ef2de 100644 --- a/mm/Kconfig +++ b/mm/Kconfig | |||
@@ -115,12 +115,17 @@ config SPARSEMEM_EXTREME | |||
115 | # eventually, we can have this option just 'select SPARSEMEM' | 115 | # eventually, we can have this option just 'select SPARSEMEM' |
116 | config MEMORY_HOTPLUG | 116 | config MEMORY_HOTPLUG |
117 | bool "Allow for memory hot-add" | 117 | bool "Allow for memory hot-add" |
118 | depends on SPARSEMEM && HOTPLUG && !SOFTWARE_SUSPEND && ARCH_ENABLE_MEMORY_HOTPLUG | 118 | depends on SPARSEMEM || X86_64_ACPI_NUMA |
119 | depends on HOTPLUG && !SOFTWARE_SUSPEND && ARCH_ENABLE_MEMORY_HOTPLUG | ||
119 | depends on (IA64 || X86 || PPC64) | 120 | depends on (IA64 || X86 || PPC64) |
120 | 121 | ||
121 | comment "Memory hotplug is currently incompatible with Software Suspend" | 122 | comment "Memory hotplug is currently incompatible with Software Suspend" |
122 | depends on SPARSEMEM && HOTPLUG && SOFTWARE_SUSPEND | 123 | depends on SPARSEMEM && HOTPLUG && SOFTWARE_SUSPEND |
123 | 124 | ||
125 | config MEMORY_HOTPLUG_SPARSE | ||
126 | def_bool y | ||
127 | depends on SPARSEMEM && MEMORY_HOTPLUG | ||
128 | |||
124 | # Heavily threaded applications may benefit from splitting the mm-wide | 129 | # Heavily threaded applications may benefit from splitting the mm-wide |
125 | # page_table_lock, so that faults on different parts of the user address | 130 | # page_table_lock, so that faults on different parts of the user address |
126 | # space can be handled with less contention: split it at this NR_CPUS. | 131 | # space can be handled with less contention: split it at this NR_CPUS. |