浏览代码

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>
Tim Abbott 16 年之前
父节点
当前提交
13beadd91f
共有 1 个文件被更改,包括 2 次插入2 次删除
  1. 2 2
      arch/powerpc/kernel/vmlinux.lds.S

+ 2 - 2
arch/powerpc/kernel/vmlinux.lds.S

@@ -54,8 +54,8 @@ SECTIONS
 		ALIGN_FUNCTION();
 		ALIGN_FUNCTION();
 		HEAD_TEXT
 		HEAD_TEXT
 		_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
 		SCHED_TEXT
 		LOCK_TEXT
 		LOCK_TEXT
 		KPROBES_TEXT
 		KPROBES_TEXT