Merge branch 'locking-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[muen/linux.git] / arch / s390 / kernel / vmlinux.lds.S

diff --git a/arch/s390/kernel/vmlinux.lds.S b/arch/s390/kernel/vmlinux.lds.S
index 457713f4873417d02596d15bd83e556a81a2d90c..21eb7407d51bac8e71f3743defba1f7de5291e3d 100644 (file)
--- a/arch/s390/kernel/vmlinux.lds.S
+++ b/arch/s390/kernel/vmlinux.lds.S
@@ -16,6 +16,7 @@
 #define RO_AFTER_INIT_DATA
 
 #include <asm-generic/vmlinux.lds.h>
+#include <asm/vmlinux.lds.h>
 
 OUTPUT_FORMAT("elf64-s390", "elf64-s390", "elf64-s390")
 OUTPUT_ARCH(s390:64-bit)
@@ -135,6 +136,8 @@ SECTIONS
                __nospec_return_end = . ;
        }
 
+       BOOT_DATA
+
        /* early.c uses stsi, which requires page aligned data. */
        . = ALIGN(PAGE_SIZE);
        INIT_DATA_SECTION(0x100)
@@ -147,6 +150,19 @@ SECTIONS
 
        _end = . ;
 
+       /*
+        * uncompressed image info used by the decompressor
+        * it should match struct vmlinux_info
+        */
+       .vmlinux.info 0 : {
+               QUAD(_stext)                                    /* default_lma */
+               QUAD(startup_continue)                          /* entry */
+               QUAD(__bss_start - _stext)                      /* image_size */
+               QUAD(__bss_stop - __bss_start)                  /* bss_size */
+               QUAD(__boot_data_start)                         /* bootdata_off */
+               QUAD(__boot_data_end - __boot_data_start)       /* bootdata_size */
+       }
+
        /* Debugging sections.  */
        STABS_DEBUG
        DWARF_DEBUG