From 45f580d9c36b93204882dffc6fb9f4a254c3d34a Mon Sep 17 00:00:00 2001 From: Bryan Huntsman Date: Wed, 23 Nov 2011 12:31:46 -0800 Subject: [PATCH] ARM: allow memory hotplug/hotremove Add ARM to the supported list of architectures for MEMORY_HOTPLUG. For ARM, the selection of MEMORY_HOTPLUG/REMOVE is specific to the sub-arch and has to be explicitly enabled by the sub-arch. Signed-off-by: Bryan Huntsman --- arch/arm/Kconfig | 6 ++++++ mm/Kconfig | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 3eeac925552..2097e0aaf51 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1634,6 +1634,12 @@ config DONT_MAP_HOLE_AFTER_MEMBANK0 def_bool n depends on SPARSEMEM +config ARCH_ENABLE_MEMORY_HOTPLUG + def_bool n + +config ARCH_ENABLE_MEMORY_HOTREMOVE + def_bool n + config FORCE_MAX_ZONEORDER int "Maximum zone order" if ARCH_SHMOBILE range 11 64 if ARCH_SHMOBILE diff --git a/mm/Kconfig b/mm/Kconfig index 8ca47a5ee9c..9f30530d110 100644 --- a/mm/Kconfig +++ b/mm/Kconfig @@ -136,7 +136,7 @@ config MEMORY_HOTPLUG bool "Allow for memory hot-add" depends on SPARSEMEM || X86_64_ACPI_NUMA depends on HOTPLUG && ARCH_ENABLE_MEMORY_HOTPLUG - depends on (IA64 || X86 || PPC_BOOK3S_64 || SUPERH || S390) + depends on (IA64 || X86 || PPC_BOOK3S_64 || SUPERH || S390 || ARM) config MEMORY_HOTPLUG_SPARSE def_bool y