1 files changed, 3 insertions, 1 deletions

diff --git a/include/linux/init.h b/include/linux/init.h
index f8d9d0b5cffc..5141381a7527 100644
--- a/include/linux/init.h
+++ b/include/linux/init.h
@@ -67,8 +67,10 @@
 
 /* For assembly routines */
 #define __INIT          .section        ".init.text","ax"
+#define __INIT_REFOK    .section        ".text.init.refok","ax"
 #define __FINIT         .previous
 #define __INITDATA      .section        ".init.data","aw"
+#define __INITDATA_REFOK .section       ".data.init.refok","aw"
 
 #ifndef __ASSEMBLY__
 /*
@@ -159,7 +161,7 @@ struct obs_kernel_param {
  * obs_kernel_param "array" too far apart in .init.setup.
  */
 #define __setup_param(str, unique_id, fn, early)                        \
-        static char __setup_str_##unique_id[] __initdata = str; \
+        static char __setup_str_##unique_id[] __initdata __aligned(1) = str; \
         static struct obs_kernel_param __setup_##unique_id      \
                 __attribute_used__                              \
                 __attribute__((__section__(".init.setup")))     \