h8300: Cleanup linker script using new linker script macros.

Signed-off-by: Tim Abbott <tabbott@ksplice.com>
Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
Acked-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/arch/h8300/kernel/vmlinux.lds.S b/arch/h8300/kernel/vmlinux.lds.S
index 662b02e..b9e2490 100644 (file)
--- a/arch/h8300/kernel/vmlinux.lds.S
+++ b/arch/h8300/kernel/vmlinux.lds.S
@@ -1,5 +1,6 @@
 #define VMLINUX_SYMBOL(_sym_) _##_sym_
 #include <asm-generic/vmlinux.lds.h>
+#include <asm/page.h>
 
 /* target memory map */
 #ifdef CONFIG_H8300H_GENERIC
@@ -79,11 +80,8 @@ SECTIONS
        SCHED_TEXT
        LOCK_TEXT
        __etext = . ;
-       . = ALIGN(16);          /* Exception table              */
-       ___start___ex_table = .;
-               *(__ex_table)
-       ___stop___ex_table = .;
        }
+       EXCEPTION_TABLE(16)
 
        RODATA
 #if defined(CONFIG_ROMKERNEL)
@@ -100,8 +98,7 @@ SECTIONS
        __sdata = . ;
        ___data_start = . ;
 
-       . = ALIGN(0x2000) ;
-               *(.data.init_task)
+       INIT_TASK_DATA(0x2000)
        . = ALIGN(0x4) ;
                DATA_DATA
        . = ALIGN(0x4) ;
@@ -114,24 +111,16 @@ SECTIONS
        __einittext = .; 
                INIT_DATA
        . = ALIGN(0x4) ;
+       INIT_SETUP(0x4)
        ___setup_start = .;
                *(.init.setup)
        . = ALIGN(0x4) ;
        ___setup_end = .;
-       ___initcall_start = .;
-               INITCALLS
-       ___initcall_end = .;
-       ___con_initcall_start = .;
-               *(.con_initcall.init)
-       ___con_initcall_end = .;
+       INIT_CALLS
+       CON_INITCALL
                EXIT_TEXT
                EXIT_DATA
-#if defined(CONFIG_BLK_DEV_INITRD)
-               . = ALIGN(4);
-       ___initramfs_start = .;
-               *(.init.ramfs)
-       ___initramfs_end = .;
-#endif
+       INIT_RAM_FS
        . = ALIGN(0x4) ;
        ___init_end = .;
        __edata = . ;