1 files changed, 22 insertions, 92 deletions

diff --git a/arch/mips/kernel/vmlinux.lds.S b/arch/mips/kernel/vmlinux.lds.S
index 58738c8d754f..2769bed3d2af 100644
--- a/arch/mips/kernel/vmlinux.lds.S
+++ b/arch/mips/kernel/vmlinux.lds.S
@@ -1,4 +1,5 @@
 #include <asm/asm-offsets.h>
+#include <asm/page.h>
 #include <asm-generic/vmlinux.lds.h>
 
 #undef mips
@@ -42,13 +43,7 @@ SECTIONS
         } :text = 0
         _etext = .;     /* End of text section */
 
-        /* Exception table */
-        . = ALIGN(16);
-        __ex_table : {
-                __start___ex_table = .;
-                *(__ex_table)
-                __stop___ex_table = .;
-        }
+        EXCEPTION_TABLE(16)
 
         /* Exception table for data bus errors */
         __dbe_table : {
@@ -65,20 +60,10 @@ SECTIONS
         /* writeable */
         .data : {       /* Data */
                 . = . + DATAOFFSET;             /* for CONFIG_MAPPED_KERNEL */
-                /*
-                 * This ALIGN is needed as a workaround for a bug a
-                 * gcc bug upto 4.1 which limits the maximum alignment
-                 * to at most 32kB and results in the following
-                 * warning:
-                 *
-                 *  CC      arch/mips/kernel/init_task.o
-                 * arch/mips/kernel/init_task.c:30: warning: alignment
-                 * of ‘init_thread_union’ is greater than maximum
-                 * object file alignment.  Using 32768
-                 */
-                . = ALIGN(_PAGE_SIZE);
-                *(.data.init_task)
 
+                INIT_TASK_DATA(PAGE_SIZE)
+                NOSAVE_DATA
+                CACHELINE_ALIGNED_DATA(1 << CONFIG_MIPS_L1_CACHE_SHIFT)
                 DATA_DATA
                 CONSTRUCTORS
         }
@@ -95,51 +80,13 @@ SECTIONS
         .sdata : {
                 *(.sdata)
         }
-
-        . = ALIGN(_PAGE_SIZE);
-        .data_nosave : {
-                __nosave_begin = .;
-                *(.data.nosave)
-        }
-        . = ALIGN(_PAGE_SIZE);
-        __nosave_end = .;
-
-        . = ALIGN(1 << CONFIG_MIPS_L1_CACHE_SHIFT);
-        .data.cacheline_aligned : {
-                *(.data.cacheline_aligned)
-        }
         _edata =  .;                    /* End of data section */
 
         /* will be freed after init */
-        . = ALIGN(_PAGE_SIZE);          /* Init code and data */
+        . = ALIGN(PAGE_SIZE);           /* Init code and data */
         __init_begin = .;
-        .init.text : {
-                _sinittext = .;
-                INIT_TEXT
-                _einittext = .;
-        }
-        .init.data : {
-                INIT_DATA
-        }
-        . = ALIGN(16);
-        .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
+        INIT_TEXT_SECTION(PAGE_SIZE)
+        INIT_DATA_SECTION(16)
 
         /* .exit.text is discarded at runtime, not link time, to deal with
          * references from .rodata
@@ -150,43 +97,16 @@ SECTIONS
         .exit.data : {
                 EXIT_DATA
         }
-#if defined(CONFIG_BLK_DEV_INITRD)
-        . = ALIGN(_PAGE_SIZE);
-        .init.ramfs : {
-                __initramfs_start = .;
-                *(.init.ramfs)
-                __initramfs_end = .;
-        }
-#endif
-        PERCPU(_PAGE_SIZE)
-        . = ALIGN(_PAGE_SIZE);
+
+        PERCPU(PAGE_SIZE)
+        . = ALIGN(PAGE_SIZE);
         __init_end = .;
         /* freed after init ends here */
 
-        __bss_start = .;        /* BSS */
-        .sbss  : {
-                *(.sbss)
-                *(.scommon)
-        }
-        .bss : {
-                *(.bss)
-                *(COMMON)
-        }
-        __bss_stop = .;
+        BSS_SECTION(0, 0, 0)
 
         _end = . ;
 
-        /* Sections to be discarded */
-        /DISCARD/ : {
-                *(.exitcall.exit)
-
-                /* ABI crap starts here */
-                *(.MIPS.options)
-                *(.options)
-                *(.pdr)
-                *(.reginfo)
-        }
-
         /* These mark the ABI of the kernel for debuggers.  */
         .mdebug.abi32 : {
                 KEEP(*(.mdebug.abi32))
@@ -212,4 +132,14 @@ SECTIONS
                 *(.gptab.bss)
                 *(.gptab.sbss)
         }
+
+        /* Sections to be discarded */
+        DISCARDS
+        /DISCARD/ : {
+                /* ABI crap starts here */
+                *(.MIPS.options)
+                *(.options)
+                *(.pdr)
+                *(.reginfo)
+        }
 }