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 <[email protected]>
Requested-by: Paul Mackerras <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>

diff --git a/arch/powerpc/kernel/vmlinux.lds.S b/arch/powerpc/kernel/vmlinux.lds.S
index 433ae118406de865c371165158cffbb761c685ed..a047a6cfca4d4c44cece3559e080da76efa7b5d8 100644 (file)
--- 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