aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Abbott <tabbott@MIT.EDU>2009-04-28 11:47:15 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2009-04-28 15:55:14 -0700
commit13beadd91f148933f47947a88ab2c97a1ca9768d (patch)
tree7dd1c38768401a3d0dfd65fb03020a80ede02700
parent27b1833279995e7c290a40cac4ef36ccea7e9283 (diff)
downloadlinux-13beadd91f148933f47947a88ab2c97a1ca9768d.tar.gz
powerpc: Revert switch to TEXT_TEXT in linker script
Commit edada399 broke the build on 64-bit powerpc because it moved the __ftr_alt_* sections of a file away from the .text section, causing link failures due to relative conditional branch targets being too far away from the branch instructions. This happens on pretty much all 64-bit powerpc configs. This change reverts commit edada399 while preserving the update from the *.refok sections to .ref.text that has happened since. Signed-off-by: Tim Abbott <tabbott@mit.edu> Requested-by: Paul Mackerras <paulus@samba.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--arch/powerpc/kernel/vmlinux.lds.S4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/kernel/vmlinux.lds.S b/arch/powerpc/kernel/vmlinux.lds.S
index 433ae118406..a047a6cfca4 100644
--- a/arch/powerpc/kernel/vmlinux.lds.S
+++ b/arch/powerpc/kernel/vmlinux.lds.S
@@ -54,8 +54,8 @@ SECTIONS
ALIGN_FUNCTION();
HEAD_TEXT
_text = .;
- TEXT_TEXT
- *(.fixup __ftr_alt_*)
+ /* careful! __ftr_alt_* sections need to be close to .text */
+ *(.text .fixup __ftr_alt_* .ref.text)
SCHED_TEXT
LOCK_TEXT
KPROBES_TEXT