[S390] Enable kmemleak on s390.

[safe/jmp/linux-2.6] / arch / s390 / kernel / vmlinux.lds.S

diff --git a/arch/s390/kernel/vmlinux.lds.S b/arch/s390/kernel/vmlinux.lds.S
index 849120e..a68ac10 100644 (file)
--- a/arch/s390/kernel/vmlinux.lds.S
+++ b/arch/s390/kernel/vmlinux.lds.S
@@ -2,6 +2,7 @@
  * Written by Martin Schwidefsky (schwidefsky@de.ibm.com)
  */
 
+#include <asm/thread_info.h>
 #include <asm/page.h>
 #include <asm-generic/vmlinux.lds.h>
 
@@ -17,22 +18,31 @@ ENTRY(_start)
 jiffies = jiffies_64;
 #endif
 
+PHDRS {
+       text PT_LOAD FLAGS(5);  /* R_E */
+       data PT_LOAD FLAGS(7);  /* RWE */
+       note PT_NOTE FLAGS(0);  /* ___ */
+}
+
 SECTIONS
 {
        . = 0x00000000;
        .text : {
        _text = .;              /* Text and read-only data */
-               *(.text.head)
-       TEXT_TEXT
+               HEAD_TEXT
+               TEXT_TEXT
                SCHED_TEXT
                LOCK_TEXT
                KPROBES_TEXT
+               IRQENTRY_TEXT
                *(.fixup)
                *(.gnu.warning)
-       } = 0x0700
+       } :text = 0x0700
 
        _etext = .;             /* End of text section */
 
+       NOTES :text :note
+
        RODATA
 
 #ifdef CONFIG_SHARED_KERNEL
@@ -41,120 +51,44 @@ SECTIONS
 
        . = ALIGN(PAGE_SIZE);
        _eshared = .;           /* End of shareable data */
+       _sdata = .;             /* Start of data section */
 
-       . = ALIGN(16);          /* Exception table */
-       __ex_table : {
-               __start___ex_table = .;
-               *(__ex_table)
-               __stop___ex_table = .;
-       }
-
-       NOTES
-       BUG_TABLE
-
-       .data : {               /* Data */
-               DATA_DATA
-               CONSTRUCTORS
-       }
-
-       . = ALIGN(PAGE_SIZE);
-       .data_nosave : {
-       __nosave_begin = .;
-               *(.data.nosave)
-       }
-       . = ALIGN(PAGE_SIZE);
-       __nosave_end = .;
-
-       . = ALIGN(PAGE_SIZE);
-       .data.page_aligned : {
-               *(.data.idt)
-       }
+       EXCEPTION_TABLE(16) :data
 
-       . = ALIGN(0x100);
-       .data.cacheline_aligned : {
-               *(.data.cacheline_aligned)
-       }
+       RW_DATA_SECTION(0x100, PAGE_SIZE, THREAD_SIZE)
 
-       . = ALIGN(0x100);
-       .data.read_mostly : {
-               *(.data.read_mostly)
-       }
        _edata = .;             /* End of data section */
 
-       . = ALIGN(2 * PAGE_SIZE);       /* init_task */
-       .data.init_task : {
-               *(.data.init_task)
-       }
-
        /* will be freed after init */
        . = ALIGN(PAGE_SIZE);   /* Init code and data */
        __init_begin = .;
-       .init.text : {
-               _sinittext = .;
-               *(.init.text)
-               _einittext = .;
-       }
+
+       INIT_TEXT_SECTION(PAGE_SIZE)
+
        /*
         * .exit.text is discarded at runtime, not link time,
         * to deal with references from __bug_table
        */
        .exit.text : {
-               *(.exit.text)
+               EXIT_TEXT
        }
 
-       .init.data : {
-               *(.init.data)
-       }
-       . = ALIGN(0x100);
-       .init.setup : {
-               __setup_start = .;
-               *(.init.setup)
-               __setup_end = .;
-       }
-       .initcall.init : {
-               __initcall_start = .;
-               INITCALLS
-               __initcall_end = .;
-       }
-
-       .con_initcall.init : {
-               __con_initcall_start = .;
-               *(.con_initcall.init)
-               __con_initcall_end = .;
-       }
-       SECURITY_INIT
-
-#ifdef CONFIG_BLK_DEV_INITRD
-       . = ALIGN(0x100);
-       .init.ramfs : {
-               __initramfs_start = .;
-               *(.init.ramfs)
-               . = ALIGN(2);
-               __initramfs_end = .;
-       }
-#endif
+       /* early.c uses stsi, which requires page aligned data. */
+       . = ALIGN(PAGE_SIZE);
+       INIT_DATA_SECTION(0x100)
 
        PERCPU(PAGE_SIZE)
        . = ALIGN(PAGE_SIZE);
        __init_end = .;         /* freed after init ends here */
 
-       /* BSS */
-       .bss : {
-               __bss_start = .;
-               *(.bss)
-               . = ALIGN(2);
-               __bss_stop = .;
-       }
+       BSS_SECTION(0, 2, 0)
 
        _end = . ;
 
-       /* Sections to be discarded */
-       /DISCARD/ : {
-               *(.exit.data)
-               *(.exitcall.exit)
-       }
-
        /* Debugging sections.  */
        STABS_DEBUG
        DWARF_DEBUG
+
+       /* Sections to be discarded */
+       DISCARDS
 }