| From b645105465ba5d050e62ded1ac487694fb683079 Mon Sep 17 00:00:00 2001 |
| From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| Date: Wed, 5 Jun 2019 20:40:30 +0200 |
| Subject: Revert "x86/build: Move _etext to actual end of .text" |
| |
| From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| 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> |
| --- |
| arch/x86/kernel/vmlinux.lds.S | 6 +++--- |
| 1 file changed, 3 insertions(+), 3 deletions(-) |
| |
| --- a/arch/x86/kernel/vmlinux.lds.S |
| +++ b/arch/x86/kernel/vmlinux.lds.S |
| @@ -151,10 +151,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 |
| |
