diff options
| author | Andi Kleen | 2006-04-07 19:49:15 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2006-04-09 20:53:16 +0200 |
| commit | 9d99aaa31f5994d1923c3713ce9144c4c42332e1 (patch) | |
| tree | ae608593ca196dd6493cccbdfc1b8dd098e91ee8 /include/linux/init.h | |
| parent | [PATCH] x86_64: Clean up execve path (diff) | |
| download | kernel-qcow2-linux-9d99aaa31f5994d1923c3713ce9144c4c42332e1.tar.gz kernel-qcow2-linux-9d99aaa31f5994d1923c3713ce9144c4c42332e1.tar.xz kernel-qcow2-linux-9d99aaa31f5994d1923c3713ce9144c4c42332e1.zip | |
[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 'include/linux/init.h')
| -rw-r--r-- | include/linux/init.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/init.h b/include/linux/init.h index ed0ac7c39fdc..93dcbe1abb4c 100644 --- a/include/linux/init.h +++ b/include/linux/init.h @@ -245,7 +245,8 @@ void __init parse_early_param(void); #define __cpuexitdata __exitdata #endif -#ifdef CONFIG_MEMORY_HOTPLUG +#if defined(CONFIG_MEMORY_HOTPLUG) || defined(CONFIG_ACPI_HOTPLUG_MEMORY) \ + || defined(CONFIG_ACPI_HOTPLUG_MEMORY_MODULE) #define __meminit #define __meminitdata #define __memexit |