aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorTim Abbott <tabbott@ksplice.com>2009-09-24 10:36:21 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2009-09-24 20:16:22 -0400
commiteb121d1f17480793a0d8aa278929976dbb7612f5 (patch)
treeb19897920a97975d07f7728c701c9ec8870800c8 /arch
parent5d150a97f9391f5bcd7ba0d59d7a11c3de3cea80 (diff)
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>
Diffstat (limited to 'arch')
-rw-r--r--arch/h8300/kernel/vmlinux.lds.S25
1 files changed, 7 insertions, 18 deletions
diff --git a/arch/h8300/kernel/vmlinux.lds.S b/arch/h8300/kernel/vmlinux.lds.S
index 662b02ecb86..b9e24907e6e 100644
--- a/arch/h8300/kernel/vmlinux.lds.S
+++ b/arch/h8300/kernel/vmlinux.lds.S
@@ -1,5 +1,6 @@
1#define VMLINUX_SYMBOL(_sym_) _##_sym_ 1#define VMLINUX_SYMBOL(_sym_) _##_sym_
2#include <asm-generic/vmlinux.lds.h> 2#include <asm-generic/vmlinux.lds.h>
3#include <asm/page.h>
3 4
4/* target memory map */ 5/* target memory map */
5#ifdef CONFIG_H8300H_GENERIC 6#ifdef CONFIG_H8300H_GENERIC
@@ -79,11 +80,8 @@ SECTIONS
79 SCHED_TEXT 80 SCHED_TEXT
80 LOCK_TEXT 81 LOCK_TEXT
81 __etext = . ; 82 __etext = . ;
82 . = ALIGN(16); /* Exception table */
83 ___start___ex_table = .;
84 *(__ex_table)
85 ___stop___ex_table = .;
86 } 83 }
84 EXCEPTION_TABLE(16)
87 85
88 RODATA 86 RODATA
89#if defined(CONFIG_ROMKERNEL) 87#if defined(CONFIG_ROMKERNEL)
@@ -100,8 +98,7 @@ SECTIONS
100 __sdata = . ; 98 __sdata = . ;
101 ___data_start = . ; 99 ___data_start = . ;
102 100
103 . = ALIGN(0x2000) ; 101 INIT_TASK_DATA(0x2000)
104 *(.data.init_task)
105 . = ALIGN(0x4) ; 102 . = ALIGN(0x4) ;
106 DATA_DATA 103 DATA_DATA
107 . = ALIGN(0x4) ; 104 . = ALIGN(0x4) ;
@@ -114,24 +111,16 @@ SECTIONS
114 __einittext = .; 111 __einittext = .;
115 INIT_DATA 112 INIT_DATA
116 . = ALIGN(0x4) ; 113 . = ALIGN(0x4) ;
114 INIT_SETUP(0x4)
117 ___setup_start = .; 115 ___setup_start = .;
118 *(.init.setup) 116 *(.init.setup)
119 . = ALIGN(0x4) ; 117 . = ALIGN(0x4) ;
120 ___setup_end = .; 118 ___setup_end = .;
121 ___initcall_start = .; 119 INIT_CALLS
122 INITCALLS 120 CON_INITCALL
123 ___initcall_end = .;
124 ___con_initcall_start = .;
125 *(.con_initcall.init)
126 ___con_initcall_end = .;
127 EXIT_TEXT 121 EXIT_TEXT
128 EXIT_DATA 122 EXIT_DATA
129#if defined(CONFIG_BLK_DEV_INITRD) 123 INIT_RAM_FS
130 . = ALIGN(4);
131 ___initramfs_start = .;
132 *(.init.ramfs)
133 ___initramfs_end = .;
134#endif
135 . = ALIGN(0x4) ; 124 . = ALIGN(0x4) ;
136 ___init_end = .; 125 ___init_end = .;
137 __edata = . ; 126 __edata = . ;