Messages in this thread | | | Date | Wed, 25 Nov 2009 16:21:43 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the rr tree with the arm tree |
| |
Hi Rusty,
Today's linux-next merge of the rr tree got a conflict in arch/arm/kernel/vmlinux.lds.S between commit 78d7530ac338e458fa513527ee7bb4278d0d8017 ("ARM: Clean up linker script using new linker script macros") from the arm tree and commit 0a5e2c8918d0945f6384e104050c5234057455df ("ARM: use unified discard definition in linker script") from the rr tree.
Just context changes. I fixed it up (see below) and can carry the fix as necessary. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/arm/kernel/vmlinux.lds.S index 71151bd,ec511d4..0000000 --- a/arch/arm/kernel/vmlinux.lds.S +++ b/arch/arm/kernel/vmlinux.lds.S @@@ -58,18 -77,13 +58,18 @@@ SECTION #endif } + PERCPU(PAGE_SIZE) + +#ifndef CONFIG_XIP_KERNEL + . = ALIGN(PAGE_SIZE); + __init_end = .; +#endif + - /DISCARD/ : { /* Exit code and data */ - EXIT_TEXT - EXIT_DATA - *(.exitcall.exit) - *(.discard) + /* + * unwind exit sections must be discarded before the rest of the + * unwind sections get included. + */ + /DISCARD/ : { *(.ARM.exidx.exit.text) *(.ARM.extab.exit.text) #ifndef CONFIG_HOTPLUG_CPU @@@ -233,11 -256,24 +233,14 @@@ } #endif - .bss : { - __bss_start = .; /* BSS */ - *(.bss) - *(COMMON) - __bss_stop = .; - _end = .; - } - /* Stabs debugging sections. */ - .stab 0 : { *(.stab) } - .stabstr 0 : { *(.stabstr) } - .stab.excl 0 : { *(.stab.excl) } - .stab.exclstr 0 : { *(.stab.exclstr) } - .stab.index 0 : { *(.stab.index) } - .stab.indexstr 0 : { *(.stab.indexstr) } + BSS_SECTION(0, 0, 0) + _end = .; + + STABS_DEBUG .comment 0 : { *(.comment) } + + /* Default discards */ + DISCARDS } /*
| |