aboutsummaryrefslogtreecommitdiffstats
path: root/arch/parisc
diff options
context:
space:
mode:
authorJohn David Anglin <dave.anglin@bell.net>2012-05-17 10:34:34 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-06-10 00:32:58 +0900
commit488f1224df8e32d9592afbcaf6d2c393d6ad6d8f (patch)
tree8798066af2c6fe46d3302a23c13f65dcfe9d7906 /arch/parisc
parent93b71523531161bfdd2ac30dd1ea4bb70d1708bd (diff)
downloadkernel_samsung_smdk4412-488f1224df8e32d9592afbcaf6d2c393d6ad6d8f.zip
kernel_samsung_smdk4412-488f1224df8e32d9592afbcaf6d2c393d6ad6d8f.tar.gz
kernel_samsung_smdk4412-488f1224df8e32d9592afbcaf6d2c393d6ad6d8f.tar.bz2
PARISC: fix boot failure on 32-bit systems caused by branch stubs placed before .text
commit ed5fb2471b7060767957fb964eb1aaec71533ab1 upstream. 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> Signed-off-by: James Bottomley <JBottomley@Parallels.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
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 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 = .;