1 files changed, 8 insertions, 29 deletions

diff --git a/arch/cris/kernel/vmlinux.lds.S b/arch/cris/kernel/vmlinux.lds.S
index 0d2adfc794d4..971c2fa08f2d 100644
--- a/arch/cris/kernel/vmlinux.lds.S
+++ b/arch/cris/kernel/vmlinux.lds.S
@@ -51,10 +51,7 @@ SECTIONS
         _etext = . ;                    /* End of text section. */
         __etext = .;
 
-        . = ALIGN(4);                   /* Exception table. */
-        __start___ex_table = .;
-        __ex_table : { *(__ex_table) }
-        __stop___ex_table = .;
+        EXCEPTION_TABLE(4)
 
         RODATA
 
@@ -67,36 +64,24 @@ SECTIONS
         __edata = . ;                   /* End of data section. */
         _edata = . ;
 
-        . = ALIGN(PAGE_SIZE);   /* init_task and stack, must be aligned. */
-        .data.init_task : { *(.data.init_task) }
+        INIT_TASK_DATA_SECTION(PAGE_SIZE)
 
         . = ALIGN(PAGE_SIZE);           /* Init code and data. */
         __init_begin = .;
-        .init.text : {
-                   _sinittext = .;
-                   INIT_TEXT
-                   _einittext = .;
-        }
+        INIT_TEXT_SECTION(PAGE_SIZE)
         .init.data : { INIT_DATA }
-        . = ALIGN(16);
-        __setup_start = .;
-        .init.setup : { *(.init.setup) }
-        __setup_end = .;
+        .init.setup : { INIT_SETUP(16) }
 #ifdef CONFIG_ETRAX_ARCH_V32
         __start___param = .;
         __param : { *(__param) }
         __stop___param = .;
 #endif
         .initcall.init : {
-                __initcall_start = .;
-                INITCALLS
-                __initcall_end = .;
+                INIT_CALLS
         }
 
         .con_initcall.init : {
-                __con_initcall_start = .;
-                *(.con_initcall.init)
-                __con_initcall_end = .;
+                CON_INITCALL
         }
         SECURITY_INIT
 
@@ -114,9 +99,7 @@ SECTIONS
         PERCPU(PAGE_SIZE)
 
         .init.ramfs : {
-                __initramfs_start = .;
-                *(.init.ramfs)
-                __initramfs_end = .;
+                INIT_RAM_FS
         }
 #endif
 
@@ -130,11 +113,7 @@ SECTIONS
         __init_end = .;
 
         __data_end = . ;                /* Move to _edata ? */
-        __bss_start = .;                /* BSS. */
-        .bss : {
-                *(COMMON)
-                *(.bss)
-        }
+        BSS_SECTION(0, 0, 0)
 
         . =  ALIGN (0x20);
         _end = .;