summaryrefslogtreecommitdiffstats
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 10:52:17 +0100
commited5fb2471b7060767957fb964eb1aaec71533ab1 (patch)
treea6a0d39a4a45fc92e048e728d6459674b206659f
parent07acfc2a9349a8ce45b236c2624dad452001966b (diff)
downloadop-kernel-dev-ed5fb2471b7060767957fb964eb1aaec71533ab1.zip
op-kernel-dev-ed5fb2471b7060767957fb964eb1aaec71533ab1.tar.gz
[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>
-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 fa6f2b8..64a9998 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 = .;
OpenPOWER on IntegriCloud