DL-Mirrors/kernel-tenderloin-3.0
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "ARM: allow memory hotplug/hotremove" into msm-3.0

Browse Source
This commit is contained in:
Linux Build Service Account
2011-12-09 13:32:33 -08:00
committed by QuIC Gerrit Code Review
parent 1fe5263822 45f580d9c3
commit b5cf8a409a
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
arch/arm/Kconfig
View File

@@ -1634,6 +1634,12 @@ config DONT_MAP_HOLE_AFTER_MEMBANK0
def_bool n def_bool n
depends on SPARSEMEM depends on SPARSEMEM
config ARCH_ENABLE_MEMORY_HOTPLUG
def_bool n
config ARCH_ENABLE_MEMORY_HOTREMOVE
def_bool n
config FORCE_MAX_ZONEORDER config FORCE_MAX_ZONEORDER
int "Maximum zone order" if ARCH_SHMOBILE int "Maximum zone order" if ARCH_SHMOBILE
range 11 64 if ARCH_SHMOBILE range 11 64 if ARCH_SHMOBILE

2
mm/Kconfig
View File

@@ -136,7 +136,7 @@ config MEMORY_HOTPLUG
bool "Allow for memory hot-add" bool "Allow for memory hot-add"
depends on SPARSEMEM || X86_64_ACPI_NUMA depends on SPARSEMEM || X86_64_ACPI_NUMA
depends on HOTPLUG && ARCH_ENABLE_MEMORY_HOTPLUG 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 config MEMORY_HOTPLUG_SPARSE
def_bool y def_bool y