commit 9d99aaa31f5994d1923c3713ce9144c4c42332e1
author Andi Kleen <ak@suse.de> Fri Apr 07 19:49:15 2006 +0200
committer Linus Torvalds <torvalds@g5.osdl.org> Sun Apr 09 11:53:16 2006 -0700
tree ae608593ca196dd6493cccbdfc1b8dd098e91ee8
parent 805e8c03c9ea9bdb402a36341e02ec24825d5417

[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>

include/linux/init.h

diff --git a/include/linux/init.h b/include/linux/init.h
index ed0ac7c..93dcbe1 100644
--- a/include/linux/init.h
+++ b/include/linux/init.h
@@ -245,7 +245,8 @@
 #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