patch-2.3.16 linux/include/asm-ppc/init.h

Next file: linux/include/asm-ppc/io.h
Previous file: linux/include/asm-ppc/ide.h
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.15/linux/include/asm-ppc/init.h linux/include/asm-ppc/init.h
@@ -1,25 +1,26 @@
 #ifndef _PPC_INIT_H
 #define _PPC_INIT_H
 
-#if __GNUC__ > 2 || __GNUC_MINOR__ >= 90 /* egcs */
-#define __init __attribute__ ((__section__ (".text.init")))
-#define __initdata __attribute__ ((__section__ (".data.init")))
-#define __initfunc(__arginit) \
-	__arginit __init; \
-	__arginit
+#include <linux/init.h>
 
-#define __pmac __attribute__ ((__section__ (".text.pmac")))
+#if 0/*__GNUC__ > 2 || __GNUC_MINOR__ >= 90*/ /* egcs */
 #define __pmacdata __attribute__ ((__section__ (".data.pmac")))
 #define __pmacfunc(__argpmac) \
 	__argpmac __pmac; \
 	__argpmac
 	
 #define __prep __attribute__ ((__section__ (".text.prep")))
-#define __prepdata __attribute__ ((__section__ (".data.prep")))
+#define __prepdata /* __attribute__ ((__section__ (".data.prep")))*/
 #define __prepfunc(__argprep) \
 	__argprep __prep; \
 	__argprep
 
+#define __apus __attribute__ ((__section__ (".text.apus")))
+#define __apusdata __attribute__ ((__section__ (".data.apus")))
+#define __apusfunc(__argapus) \
+	__argapus __apus; \
+	__argapus
+
 /* this is actually just common chrp/pmac code, not OF code -- Cort */
 #define __openfirmware __attribute__ ((__section__ (".text.openfirmware")))
 #define __openfirmwaredata __attribute__ ((__section__ (".data.openfirmware")))
@@ -27,23 +28,8 @@
 	__argopenfirmware __openfirmware; \
 	__argopenfirmware
 	
-#define __INIT		.section	".text.init",#alloc,#execinstr
-#define __FINIT	.previous
-#define __INITDATA	.section	".data.init",#alloc,#write
-
-#define __cacheline_aligned __attribute__ \
-			 ((__section__ (".data.cacheline_aligned")))
-
 #else /* not egcs */
 
-#define __init
-#define __initdata
-#define __initfunc(x) x
-	
-#define __INIT
-#define __FINIT
-#define __INITDATA
-	
 #define __pmac
 #define __pmacdata
 #define __pmacfunc(x) x
@@ -52,10 +38,14 @@
 #define __prepdata
 #define __prepfunc(x) x
 
+#define __apus
+#define __apusdata
+#define __apusfunc(x) x
+
 #define __openfirmware
 #define __openfirmwaredata
 #define __openfirmwarefunc(x) x
 
-#define __cacheline_aligned
 #endif /* egcs */
-#endif
+
+#endif /* _PPC_INIT_H */

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)