Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 13beadd9 authored by Tim Abbott's avatar Tim Abbott Committed by Linus Torvalds
Browse files

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: default avatarTim Abbott <tabbott@mit.edu>
Requested-by: default avatarPaul Mackerras <paulus@samba.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 27b18332

arch/powerpc/kernel/vmlinux.lds.S

+2 −2
Original line number Diff line number Diff line
@@ -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