From: Lin Feng Date: Wed, 20 Feb 2013 02:14:14 +0000 (+1100) Subject: memory-hotplug: mm/Kconfig: move auto selects from MEMORY_HOTPLUG to MEMORY_HOTREMOVE... X-Git-Tag: next-20130220~1^2~544 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=4a74d8789923c2d9239045a8db1f5f0d912694a1;p=karo-tx-linux.git memory-hotplug: mm/Kconfig: move auto selects from MEMORY_HOTPLUG to MEMORY_HOTREMOVE as needed Since we have 2 config options called MEMORY_HOTPLUG and MEMORY_HOTREMOVE used for memory hot-add and hot-remove separately, and codes in function register_page_bootmem_info_node() are only used for collecting infomation for hot-remove(commit 04753278), so move it to MEMORY_HOTREMOVE. Besides page_isolation.c selected by MEMORY_ISOLATION under MEMORY_HOTPLUG is also such case, move it too. Signed-off-by: Lin Feng Cc: Michal Hocko Signed-off-by: Andrew Morton --- diff --git a/mm/Kconfig b/mm/Kconfig index a394ab027451..850524e032d6 100644 --- a/mm/Kconfig +++ b/mm/Kconfig @@ -172,8 +172,6 @@ config HAVE_BOOTMEM_INFO_NODE # eventually, we can have this option just 'select SPARSEMEM' config MEMORY_HOTPLUG bool "Allow for memory hot-add" - select MEMORY_ISOLATION - select HAVE_BOOTMEM_INFO_NODE if X86_64 depends on SPARSEMEM || X86_64_ACPI_NUMA depends on HOTPLUG && ARCH_ENABLE_MEMORY_HOTPLUG depends on (IA64 || X86 || PPC_BOOK3S_64 || SUPERH || S390) @@ -184,6 +182,8 @@ config MEMORY_HOTPLUG_SPARSE config MEMORY_HOTREMOVE bool "Allow for memory hot remove" + select MEMORY_ISOLATION + select HAVE_BOOTMEM_INFO_NODE if X86_64 depends on MEMORY_HOTPLUG && ARCH_ENABLE_MEMORY_HOTREMOVE depends on MIGRATION