summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-06-05 20:40:30 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-06-09 09:18:20 +0200
commit0e984ff3e1559579c289e9c918d573e5b721ab5c (patch)
treeb3661ef34668c82c77a282946d0f220d6518e033
parent08aaa79ba25bd0ec125c3a7d3a7c4a933875dc7e (diff)
downloadlinux-stable-0e984ff3e1559579c289e9c918d573e5b721ab5c.tar.gz
linux-stable-0e984ff3e1559579c289e9c918d573e5b721ab5c.tar.bz2
linux-stable-0e984ff3e1559579c289e9c918d573e5b721ab5c.zip
Revert "x86/build: Move _etext to actual end of .text"
This reverts commit 392bef709659abea614abfe53cf228e7a59876a4. It seems to cause lots of problems when using the gold linker, and no one really needs this at the moment, so just revert it from the stable trees. Cc: Sami Tolvanen <samitolvanen@google.com> Reported-by: Kees Cook <keescook@chromium.org> Cc: Borislav Petkov <bp@suse.de> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Thomas Gleixner <tglx@linutronix.de> Reported-by: Alec Ari <neotheuser@gmail.com> Cc: Ingo Molnar <mingo@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--arch/x86/kernel/vmlinux.lds.S6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/kernel/vmlinux.lds.S b/arch/x86/kernel/vmlinux.lds.S
index 23df6eebe82f..2384a2ae5ec3 100644
--- a/arch/x86/kernel/vmlinux.lds.S
+++ b/arch/x86/kernel/vmlinux.lds.S
@@ -131,10 +131,10 @@ SECTIONS
*(.text.__x86.indirect_thunk)
__indirect_thunk_end = .;
#endif
- } :text = 0x9090
- /* End of text section */
- _etext = .;
+ /* End of text section */
+ _etext = .;
+ } :text = 0x9090
NOTES :text :note