Merge branch 'linus' into core/futexes

1 files changed, 6 insertions, 6 deletions

diff --git a/include/linux/init.h b/include/linux/init.h
index 93538b696e3d..68cb0265d009 100644
--- 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__
 /*
@@ -233,9 +237,6 @@ struct obs_kernel_param {
                 __attribute__((aligned((sizeof(long)))))        \
                 = { __setup_str_##unique_id, fn, early }
 
-#define __setup_null_param(str, unique_id)                      \
-        __setup_param(str, unique_id, NULL, 0)
-
 #define __setup(str, fn)                                        \
         __setup_param(str, fn, fn, 0)
 
@@ -296,7 +297,6 @@ void __init parse_early_param(void);
         void cleanup_module(void) __attribute__((alias(#exitfn)));
 
 #define __setup_param(str, unique_id, fn)       /* nothing */
-#define __setup_null_param(str, unique_id)      /* nothing */
 #define __setup(str, func)                      /* nothing */
 #endif