diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-24 17:08:56 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-24 17:08:56 -0700 |
| commit | 5f8fe4270e53d38421ba34c428c3b58933b48e50 (patch) | |
| tree | 2148a3ba1ec842d0d0ad8f3e3eb209eb6eba673d /arch/cris/kernel/vmlinux.lds.S | |
| parent | d9fbd9a2cd5ac1b286a7d7cdb1a180ce1edaee2f (diff) | |
| parent | 24924ece4482d5466ffcd0affedce63816c88e53 (diff) | |
Merge branch 'for-linus' of git://repo.or.cz/cris-mirror
* 'for-linus' of git://repo.or.cz/cris-mirror:
CRIS: Cleanup linker script using new linker script macros.
ARRAY_SIZE changes
CRIS: convert to asm-generic/hardirq.h
CRISv10: Don't autonegotiate if autonegotiation is off
CRIS: fix defconfig build failure
CRIS: add pgprot_noncached
Diffstat (limited to 'arch/cris/kernel/vmlinux.lds.S')
| -rw-r--r-- | arch/cris/kernel/vmlinux.lds.S | 37 |
1 files changed, 8 insertions, 29 deletions
diff --git a/arch/cris/kernel/vmlinux.lds.S b/arch/cris/kernel/vmlinux.lds.S index 6c81836b922..bbfda67d290 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 = .; |