projects / thirdparty / kernel / stable-queue.git / blame
| Commit | Line | Data |
|---|---|---|
| f5db3108 GKH |
1 | From b645105465ba5d050e62ded1ac487694fb683079 Mon Sep 17 00:00:00 2001 |
| 2 | From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> | |
| 3 | Date: Wed, 5 Jun 2019 20:40:30 +0200 | |
| 4 | Subject: Revert "x86/build: Move _etext to actual end of .text" | |
| 5 | ||
| 6 | From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> | |
| 7 | ||
| 8 | This reverts commit 392bef709659abea614abfe53cf228e7a59876a4. | |
| 9 | ||
| 10 | It seems to cause lots of problems when using the gold linker, and no | |
| 11 | one really needs this at the moment, so just revert it from the stable | |
| 12 | trees. | |
| 13 | ||
| 14 | Cc: Sami Tolvanen <samitolvanen@google.com> | |
| 15 | Reported-by: Kees Cook <keescook@chromium.org> | |
| 16 | Cc: Borislav Petkov <bp@suse.de> | |
| 17 | Cc: Linus Torvalds <torvalds@linux-foundation.org> | |
| 18 | Cc: Peter Zijlstra <peterz@infradead.org> | |
| 19 | Cc: Thomas Gleixner <tglx@linutronix.de> | |
| 20 | Reported-by: Alec Ari <neotheuser@gmail.com> | |
| 21 | Cc: Ingo Molnar <mingo@kernel.org> | |
| 22 | Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> | |
| 23 | --- | |
| 24 | arch/x86/kernel/vmlinux.lds.S | 6 +++--- | |
| 25 | 1 file changed, 3 insertions(+), 3 deletions(-) | |
| 26 | ||
| 27 | --- a/arch/x86/kernel/vmlinux.lds.S | |
| 28 | +++ b/arch/x86/kernel/vmlinux.lds.S | |
| 29 | @@ -110,10 +110,10 @@ SECTIONS | |
| 30 | *(.text.__x86.indirect_thunk) | |
| 31 | __indirect_thunk_end = .; | |
| 32 | #endif | |
| 33 | - } :text = 0x9090 | |
| 34 | ||
| 35 | - /* End of text section */ | |
| 36 | - _etext = .; | |
| 37 | + /* End of text section */ | |
| 38 | + _etext = .; | |
| 39 | + } :text = 0x9090 | |
| 40 | ||
| 41 | NOTES :text :note | |
| 42 |