diff options
| author | John David Anglin <dave.anglin@bell.net> | 2012-05-17 16:34:34 +0200 |
|---|---|---|
| committer | James Bottomley <JBottomley@Parallels.com> | 2012-05-25 11:52:17 +0200 |
| commit | ed5fb2471b7060767957fb964eb1aaec71533ab1 (patch) | |
| tree | a6a0d39a4a45fc92e048e728d6459674b206659f /arch/parisc | |
| parent | Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm (diff) | |
| download | linux-ed5fb2471b7060767957fb964eb1aaec71533ab1.tar.xz linux-ed5fb2471b7060767957fb964eb1aaec71533ab1.zip | |
[PARISC] fix boot failure on 32-bit systems caused by branch stubs placed before .text
In certain configurations, the resulting kernel becomes too large to boot
because the linker places the long branch stubs for the merged .text section
at the very start of the image. As a result, the initial transfer of control
jumps to an unexpected location. Fix this by placing the head text in a
separate section so the stubs for .text are not at the start of the image.
Signed-off-by: John David Anglin <dave.anglin@bell.net>
Cc: stable@vger.kernel.org
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Diffstat (limited to 'arch/parisc')
| -rw-r--r-- | arch/parisc/kernel/vmlinux.lds.S | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/parisc/kernel/vmlinux.lds.S b/arch/parisc/kernel/vmlinux.lds.S index fa6f2b8163e0..64a999882e4f 100644 --- a/arch/parisc/kernel/vmlinux.lds.S +++ b/arch/parisc/kernel/vmlinux.lds.S @@ -50,8 +50,10 @@ SECTIONS . = KERNEL_BINARY_TEXT_START; _text = .; /* Text and read-only data */ - .text ALIGN(16) : { + .head ALIGN(16) : { HEAD_TEXT + } = 0 + .text ALIGN(16) : { TEXT_TEXT SCHED_TEXT LOCK_TEXT @@ -65,7 +67,7 @@ SECTIONS *(.fixup) *(.lock.text) /* out-of-line lock text */ *(.gnu.warning) - } = 0 + } /* End of text section */ _etext = .; |