Merge branch 'from-linus'

[linux-2.6] / include / linux / init.h

diff --git a/include/linux/init.h b/include/linux/init.h
index 05c83e0521ca6290638a22a6d22cd68c90a3d6ef..ff8d8b8632f49bf8a8e3825ba1f3535a7ca41b4e 100644 (file)
--- a/include/linux/init.h
+++ b/include/linux/init.h
@@ -229,6 +229,30 @@ void __init parse_early_param(void);
 #define __devexitdata __exitdata
 #endif
 
+#ifdef CONFIG_HOTPLUG_CPU
+#define __cpuinit
+#define __cpuinitdata
+#define __cpuexit
+#define __cpuexitdata
+#else
+#define __cpuinit      __init
+#define __cpuinitdata __initdata
+#define __cpuexit __exit
+#define __cpuexitdata  __exitdata
+#endif
+
+#ifdef CONFIG_MEMORY_HOTPLUG
+#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