tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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>

authored by

Tim Abbott and committed by
Linus Torvalds eb121d1f 5d150a97

+7 -18
+7 -18
arch/h8300/kernel/vmlinux.lds.S
··· 1 1 #define VMLINUX_SYMBOL(_sym_) _##_sym_ 2 2 #include <asm-generic/vmlinux.lds.h> 3 + #include <asm/page.h> 3 4 4 5 /* target memory map */ 5 6 #ifdef CONFIG_H8300H_GENERIC ··· 80 79 SCHED_TEXT 81 80 LOCK_TEXT 82 81 __etext = . ; 83 - . = ALIGN(16); /* Exception table */ 84 - ___start___ex_table = .; 85 - *(__ex_table) 86 - ___stop___ex_table = .; 87 82 } 83 + EXCEPTION_TABLE(16) 88 84 89 85 RODATA 90 86 #if defined(CONFIG_ROMKERNEL) ··· 98 100 __sdata = . ; 99 101 ___data_start = . ; 100 102 101 - . = ALIGN(0x2000) ; 102 - *(.data.init_task) 103 + INIT_TASK_DATA(0x2000) 103 104 . = ALIGN(0x4) ; 104 105 DATA_DATA 105 106 . = ALIGN(0x4) ; ··· 111 114 __einittext = .; 112 115 INIT_DATA 113 116 . = ALIGN(0x4) ; 117 + INIT_SETUP(0x4) 114 118 ___setup_start = .; 115 119 *(.init.setup) 116 120 . = ALIGN(0x4) ; 117 121 ___setup_end = .; 118 - ___initcall_start = .; 119 - INITCALLS 120 - ___initcall_end = .; 121 - ___con_initcall_start = .; 122 - *(.con_initcall.init) 123 - ___con_initcall_end = .; 122 + INIT_CALLS 123 + CON_INITCALL 124 124 EXIT_TEXT 125 125 EXIT_DATA 126 - #if defined(CONFIG_BLK_DEV_INITRD) 127 - . = ALIGN(4); 128 - ___initramfs_start = .; 129 - *(.init.ramfs) 130 - ___initramfs_end = .; 131 - #endif 126 + INIT_RAM_FS 132 127 . = ALIGN(0x4) ; 133 128 ___init_end = .; 134 129 __edata = . ;