aboutsummaryrefslogtreecommitdiffstats
path: root/arch/parisc
diff options
context:
space:
mode:
authorJohn David Anglin <dave.anglin@bell.net>2012-05-17 10:34:34 -0400
committerJames Bottomley <JBottomley@Parallels.com>2012-05-25 05:52:17 -0400
commited5fb2471b7060767957fb964eb1aaec71533ab1 (patch)
treea6a0d39a4a45fc92e048e728d6459674b206659f /arch/parisc
parent07acfc2a9349a8ce45b236c2624dad452001966b (diff)
[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.S6
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
50 . = KERNEL_BINARY_TEXT_START; 50 . = KERNEL_BINARY_TEXT_START;
51 51
52 _text = .; /* Text and read-only data */ 52 _text = .; /* Text and read-only data */
53 .text ALIGN(16) : { 53 .head ALIGN(16) : {
54 HEAD_TEXT 54 HEAD_TEXT
55 } = 0
56 .text ALIGN(16) : {
55 TEXT_TEXT 57 TEXT_TEXT
56 SCHED_TEXT 58 SCHED_TEXT
57 LOCK_TEXT 59 LOCK_TEXT
@@ -65,7 +67,7 @@ SECTIONS
65 *(.fixup) 67 *(.fixup)
66 *(.lock.text) /* out-of-line lock text */ 68 *(.lock.text) /* out-of-line lock text */
67 *(.gnu.warning) 69 *(.gnu.warning)
68 } = 0 70 }
69 /* End of text section */ 71 /* End of text section */
70 _etext = .; 72 _etext = .;
71 73