From efc8c572eb546b2fca86bd4d69097997ef139e00 Mon Sep 17 00:00:00 2001 From: Keith Mannthey Date: Sat, 30 Sep 2006 23:27:05 -0700 Subject: [PATCH] --- yaml --- r: 37602 b: refs/heads/master c: ec69acbb1191df671ff8e07c8e146619a5c53f70 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/x86_64/Kconfig | 4 ++++ trunk/mm/Kconfig | 7 ++++++- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 298c281696e1..562875d37441 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f28c5edc06ecd8068b38b7662ad19f4d20d741af +refs/heads/master: ec69acbb1191df671ff8e07c8e146619a5c53f70 diff --git a/trunk/arch/x86_64/Kconfig b/trunk/arch/x86_64/Kconfig index 32ae1378f35c..b87a19f0d584 100644 --- a/trunk/arch/x86_64/Kconfig +++ b/trunk/arch/x86_64/Kconfig @@ -367,6 +367,10 @@ config ARCH_FLATMEM_ENABLE source "mm/Kconfig" +config MEMORY_HOTPLUG_RESERVE + def_bool y + depends on (MEMORY_HOTPLUG && DISCONTIGMEM) + config HAVE_ARCH_EARLY_PFN_TO_NID def_bool y depends on NUMA diff --git a/trunk/mm/Kconfig b/trunk/mm/Kconfig index 8f5b45615f7b..5d88489ef2de 100644 --- a/trunk/mm/Kconfig +++ b/trunk/mm/Kconfig @@ -115,12 +115,17 @@ config SPARSEMEM_EXTREME # eventually, we can have this option just 'select SPARSEMEM' config MEMORY_HOTPLUG bool "Allow for memory hot-add" - depends on SPARSEMEM && HOTPLUG && !SOFTWARE_SUSPEND && ARCH_ENABLE_MEMORY_HOTPLUG + depends on SPARSEMEM || X86_64_ACPI_NUMA + depends on HOTPLUG && !SOFTWARE_SUSPEND && ARCH_ENABLE_MEMORY_HOTPLUG depends on (IA64 || X86 || PPC64) comment "Memory hotplug is currently incompatible with Software Suspend" depends on SPARSEMEM && HOTPLUG && SOFTWARE_SUSPEND +config MEMORY_HOTPLUG_SPARSE + def_bool y + depends on SPARSEMEM && MEMORY_HOTPLUG + # Heavily threaded applications may benefit from splitting the mm-wide # page_table_lock, so that faults on different parts of the user address # space can be handled with less contention: split it at this NR_CPUS.