diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-05-23 18:18:40 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-05-23 18:18:40 -0400 |
| commit | fc05505b77f7900a1bb74fb3f3a4343dee4265a4 (patch) | |
| tree | 6517919cb60bd9465078512cacbefd8c77f94b76 /arch/xtensa/kernel/vmlinux.lds.S | |
| parent | a2ab67fae1ab9226679495a8d260f4e6555efc5f (diff) | |
| parent | 11c79740d3c03cb81f84e98cf2e2dbd8d9bb53cd (diff) | |
Merge branch 'ixp4xx' of git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux-2.6 into devel
Diffstat (limited to 'arch/xtensa/kernel/vmlinux.lds.S')
| -rw-r--r-- | arch/xtensa/kernel/vmlinux.lds.S | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/xtensa/kernel/vmlinux.lds.S b/arch/xtensa/kernel/vmlinux.lds.S index 5accf51053d..41c159cd872 100644 --- a/arch/xtensa/kernel/vmlinux.lds.S +++ b/arch/xtensa/kernel/vmlinux.lds.S | |||
| @@ -87,7 +87,7 @@ SECTIONS | |||
| 87 | { | 87 | { |
| 88 | /* The HEAD_TEXT section must be the first section! */ | 88 | /* The HEAD_TEXT section must be the first section! */ |
| 89 | HEAD_TEXT | 89 | HEAD_TEXT |
| 90 | *(.literal .text) | 90 | TEXT_TEXT |
| 91 | VMLINUX_SYMBOL(__sched_text_start) = .; | 91 | VMLINUX_SYMBOL(__sched_text_start) = .; |
| 92 | *(.sched.literal .sched.text) | 92 | *(.sched.literal .sched.text) |
| 93 | VMLINUX_SYMBOL(__sched_text_end) = .; | 93 | VMLINUX_SYMBOL(__sched_text_end) = .; |
| @@ -139,8 +139,6 @@ SECTIONS | |||
| 139 | __init_begin = .; | 139 | __init_begin = .; |
| 140 | .init.text : { | 140 | .init.text : { |
| 141 | _sinittext = .; | 141 | _sinittext = .; |
| 142 | *(.init.literal) *(.cpuinit.literal) | ||
| 143 | *(.devinit.literal) *(.meminit.literal) | ||
| 144 | INIT_TEXT | 142 | INIT_TEXT |
| 145 | _einittext = .; | 143 | _einittext = .; |
| 146 | } | 144 | } |