1 files changed, 13 insertions, 3 deletions

diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h
index bd69d79208de..68649336c4ad 100644
--- a/include/asm-generic/vmlinux.lds.h
+++ b/include/asm-generic/vmlinux.lds.h
@@ -67,7 +67,8 @@
  * Align to a 32 byte boundary equal to the
  * alignment gcc 4.5 uses for a struct
  */
-#define STRUCT_ALIGN() . = ALIGN(32)
+#define STRUCT_ALIGNMENT 32
+#define STRUCT_ALIGN() . = ALIGN(STRUCT_ALIGNMENT)
 
 /* The actual configuration determine if the init/exit sections
  * are handled as text/data or they can be discarded (which
@@ -146,6 +147,13 @@
 #define TRACE_SYSCALLS()
 #endif
 
+
+#define KERNEL_DTB()                                                    \
+        STRUCT_ALIGN();                                                 \
+        VMLINUX_SYMBOL(__dtb_start) = .;                                \
+        *(.dtb.init.rodata)                                             \
+        VMLINUX_SYMBOL(__dtb_end) = .;
+
 /* .data section */
 #define DATA_DATA                                                       \
         *(.data)                                                        \
@@ -192,7 +200,8 @@
 
 #define READ_MOSTLY_DATA(align)                                         \
         . = ALIGN(align);                                               \
-        *(.data..read_mostly)
+        *(.data..read_mostly)                                           \
+        . = ALIGN(align);
 
 #define CACHELINE_ALIGNED_DATA(align)                                   \
         . = ALIGN(align);                                               \
@@ -468,7 +477,8 @@
         MCOUNT_REC()                                                    \
         DEV_DISCARD(init.rodata)                                        \
         CPU_DISCARD(init.rodata)                                        \
-        MEM_DISCARD(init.rodata)
+        MEM_DISCARD(init.rodata)                                        \
+        KERNEL_DTB()
 
 #define INIT_TEXT                                                       \
         *(.init.text)                                                   \