Don't ask twice about not including staging drivers

[linux-2.6-omap-h63xx.git] / include / linux / init.h

diff --git a/include/linux/init.h b/include/linux/init.h
index ad63824460e34d2838d0a77833f21121814251cd..68cb0265d0094e81237191f7d98fcc440fabaeb0 100644 (file)
--- a/include/linux/init.h
+++ b/include/linux/init.h
@@ -40,7 +40,7 @@
 
 /* These are for everybody (although not all archs will actually
    discard it in modules) */
-#define __init         __section(.init.text) __cold
+#define __init         __section(.init.text) __cold notrace
 #define __initdata     __section(.init.data)
 #define __initconst    __section(.init.rodata)
 #define __exitdata     __section(.exit.data)
@@ -112,21 +112,25 @@
 #define __FINIT                .previous
 
 #define __INITDATA     .section        ".init.data","aw"
+#define __INITRODATA   .section        ".init.rodata","a"
 #define __FINITDATA    .previous
 
 #define __DEVINIT        .section      ".devinit.text", "ax"
 #define __DEVINITDATA    .section      ".devinit.data", "aw"
+#define __DEVINITRODATA  .section      ".devinit.rodata", "a"
 
 #define __CPUINIT        .section      ".cpuinit.text", "ax"
 #define __CPUINITDATA    .section      ".cpuinit.data", "aw"
+#define __CPUINITRODATA  .section      ".cpuinit.rodata", "a"
 
 #define __MEMINIT        .section      ".meminit.text", "ax"
 #define __MEMINITDATA    .section      ".meminit.data", "aw"
+#define __MEMINITRODATA  .section      ".meminit.rodata", "a"
 
 /* silence warnings when references are OK */
 #define __REF            .section       ".ref.text", "ax"
 #define __REFDATA        .section       ".ref.data", "aw"
-#define __REFCONST       .section       ".ref.rodata", "aw"
+#define __REFCONST       .section       ".ref.rodata", "a"
 
 #ifndef __ASSEMBLY__
 /*