[PATCH] x86_64: Support memory hotadd without sparsemem

[deliverable/linux.git] / include / linux / init.h

diff --git a/include/linux/init.h b/include/linux/init.h
index 59008c3826cf790806f1f68bd007fa172e89fc5f..93dcbe1abb4c83b65cc6af59fb84c3c5e16effbb 100644 (file)
--- a/include/linux/init.h
+++ b/include/linux/init.h
@@ -69,6 +69,10 @@ extern initcall_t __security_initcall_start[], __security_initcall_end[];
 
 /* Defined in init/main.c */
 extern char saved_command_line[];
+
+/* used by init/main.c */
+extern void setup_arch(char **);
+
 #endif
   
 #ifndef MODULE
@@ -241,6 +245,19 @@ void __init parse_early_param(void);
 #define __cpuexitdata  __exitdata
 #endif
 
+#if defined(CONFIG_MEMORY_HOTPLUG) || defined(CONFIG_ACPI_HOTPLUG_MEMORY) \
+       || defined(CONFIG_ACPI_HOTPLUG_MEMORY_MODULE)
+#define __meminit
+#define __meminitdata
+#define __memexit
+#define __memexitdata
+#else
+#define __meminit      __init
+#define __meminitdata __initdata
+#define __memexit __exit
+#define __memexitdata  __exitdata
+#endif
+
 /* Functions marked as __devexit may be discarded at kernel link time, depending
    on config options.  Newer versions of binutils detect references from
    retained sections to discarded sections and flag an error.  Pointers to