diff options
| author | Tim Abbott <tabbott@ksplice.com> | 2009-09-24 10:36:22 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-24 17:16:22 -0700 |
| commit | 4295f8b318b424be0f87c9fd9aa1eb35c9585faf (patch) | |
| tree | 3708034a9cf3b3dcb36132e5d5e6794c3b471932 | |
| parent | eb121d1f17480793a0d8aa278929976dbb7612f5 (diff) | |
mn10300: Clean up linker script using higher-level macros.
Signed-off-by: Tim Abbott <tabbott@ksplice.com>
Acked-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | arch/mn10300/kernel/vmlinux.lds.S | 40 |
1 files changed, 4 insertions, 36 deletions
diff --git a/arch/mn10300/kernel/vmlinux.lds.S b/arch/mn10300/kernel/vmlinux.lds.S index 76f41bdb79c..10549dcfb61 100644 --- a/arch/mn10300/kernel/vmlinux.lds.S +++ b/arch/mn10300/kernel/vmlinux.lds.S @@ -44,24 +44,8 @@ SECTIONS RO_DATA(PAGE_SIZE) /* writeable */ - .data : { /* Data */ - DATA_DATA - CONSTRUCTORS - } - - .data_nosave : { NOSAVE_DATA; } - - .data.page_aligned : { PAGE_ALIGNED_DATA(PAGE_SIZE); } - .data.cacheline_aligned : { CACHELINE_ALIGNED_DATA(32); } - - /* rarely changed data like cpu maps */ - . = ALIGN(32); - .data.read_mostly : AT(ADDR(.data.read_mostly)) { - READ_MOSTLY_DATA(32); - _edata = .; /* End of data section */ - } - - .data.init_task : { INIT_TASK_DATA(THREAD_SIZE); } + RW_DATA_SECTION(32, PAGE_SIZE, THREAD_SIZE) + _edata = .; /* might get freed after init */ . = ALIGN(PAGE_SIZE); @@ -74,22 +58,8 @@ SECTIONS /* will be freed after init */ . = ALIGN(PAGE_SIZE); /* Init code and data */ __init_begin = .; - .init.text : { - _sinittext = .; - INIT_TEXT; - _einittext = .; - } - .init.data : { INIT_DATA; } - .setup.init : { INIT_SETUP(16); } - - __initcall_start = .; - .initcall.init : { - INITCALLS - } - __initcall_end = .; - .con_initcall.init : { CON_INITCALL; } - - SECURITY_INIT + INIT_TEXT_SECTION(PAGE_SIZE) + INIT_DATA_SECTION(16) . = ALIGN(4); __alt_instructions = .; .altinstructions : { *(.altinstructions) } @@ -100,8 +70,6 @@ SECTIONS .exit.text : { EXIT_TEXT; } .exit.data : { EXIT_DATA; } - .init.ramfs : { INIT_RAM_FS; } - PERCPU(32) . = ALIGN(PAGE_SIZE); __init_end = .; |