summaryrefslogtreecommitdiff
path: root/arch/x86_64/Kconfig
diff options
context:
space:
mode:
authorMatt Tolentino <metolent@cs.vt.edu>2006-01-17 06:03:41 (GMT)
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-17 07:18:35 (GMT)
commit44df75e629106efcada087cead6c3f33ed6bcc60 (patch)
tree34f7c85748bf1b77c3568d4d1cc0d3d0195abcc7 /arch/x86_64/Kconfig
parent8817210d4d968e58f7d93db2eecd17b20dd03d40 (diff)
downloadlinux-44df75e629106efcada087cead6c3f33ed6bcc60.tar.xz
[PATCH] x86_64: add x86-64 support for memory hot-add
Add x86-64 specific memory hot-add functions, Kconfig options, and runtime kernel page table update functions to make hot-add usable on x86-64 machines. Also, fixup the nefarious conditional locking and exports pointed out by Andi. Tested on Intel and IBM x86-64 memory hot-add capable systems. Signed-off-by: Matt Tolentino <matthew.e.tolentino@intel.com> Signed-off-by: Andi Kleen <ak@suse.de> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/x86_64/Kconfig')
-rw-r--r--arch/x86_64/Kconfig7
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/x86_64/Kconfig b/arch/x86_64/Kconfig
index 787feff..2f9deca 100644
--- a/arch/x86_64/Kconfig
+++ b/arch/x86_64/Kconfig
@@ -305,7 +305,11 @@ config ARCH_DISCONTIGMEM_DEFAULT
config ARCH_SPARSEMEM_ENABLE
def_bool y
- depends on NUMA
+ depends on (NUMA || EXPERIMENTAL)
+
+config ARCH_MEMORY_PROBE
+ def_bool y
+ depends on MEMORY_HOTPLUG
config ARCH_FLATMEM_ENABLE
def_bool y
@@ -315,6 +319,7 @@ source "mm/Kconfig"
config HAVE_ARCH_EARLY_PFN_TO_NID
def_bool y
+ depends on NUMA
config NR_CPUS
int "Maximum number of CPUs (2-256)"