diff options
| author | Andi Kleen <ak@suse.de> | 2006-04-07 19:49:15 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-04-09 11:53:16 -0700 |
| commit | 9d99aaa31f5994d1923c3713ce9144c4c42332e1 (patch) | |
| tree | ae608593ca196dd6493cccbdfc1b8dd098e91ee8 /arch/i386 | |
| parent | 805e8c03c9ea9bdb402a36341e02ec24825d5417 (diff) | |
| download | op-kernel-dev-9d99aaa31f5994d1923c3713ce9144c4c42332e1.zip op-kernel-dev-9d99aaa31f5994d1923c3713ce9144c4c42332e1.tar.gz | |
[PATCH] x86_64: Support memory hotadd without sparsemem
Memory hotadd doesn't need SPARSEMEM, but can be handled by just preallocating
mem_maps. This only needs some untangling of ifdefs to enable the necessary
code even without SPARSEMEM.
Originally from Keith Mannthey, hacked by AK.
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/i386')
| -rw-r--r-- | arch/i386/mm/init.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/i386/mm/init.c b/arch/i386/mm/init.c index 9f66ac5..ae6534a 100644 --- a/arch/i386/mm/init.c +++ b/arch/i386/mm/init.c @@ -651,6 +651,7 @@ void __init mem_init(void) * Specifically, in the case of x86, we will always add * memory to the highmem for now. */ +#ifdef CONFIG_HOTPLUG_MEMORY #ifndef CONFIG_NEED_MULTIPLE_NODES int add_memory(u64 start, u64 size) { @@ -667,6 +668,7 @@ int remove_memory(u64 start, u64 size) return -EINVAL; } #endif +#endif kmem_cache_t *pgd_cache; kmem_cache_t *pmd_cache; |
