Commit-ID: 77a1619947ab31564aed54621d5b1e34af9b395d Gitweb: https://git.kernel.org/tip/77a1619947ab31564aed54621d5b1e34af9b395d Author: Ross Zwisler <zwisler@xxxxxxxxxxxx> AuthorDate: Mon, 1 Jul 2019 09:52:08 -0600 Committer: Thomas Gleixner <tglx@xxxxxxxxxxxxx> CommitDate: Tue, 2 Jul 2019 21:09:44 +0200 Revert "x86/build: Move _etext to actual end of .text" This reverts commit 392bef709659abea614abfe53cf228e7a59876a4. Per the discussion here: https://lkml.kernel.org/r/201906201042.3BF5CD6@keescook the above referenced commit breaks kernel compilation with old GCC toolchains as well as current versions of the Gold linker. Revert it to fix the regression and to keep the ability to compile the kernel with these tools. Signed-off-by: Ross Zwisler <zwisler@xxxxxxxxxx> Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx> Reviewed-by: Guenter Roeck <groeck@xxxxxxxxxxxx> Cc: "H. Peter Anvin" <hpa@xxxxxxxxx> Cc: Borislav Petkov <bp@xxxxxxxxx> Cc: Kees Cook <keescook@xxxxxxxxxxxx> Cc: Johannes Hirte <johannes.hirte@xxxxxxxxxxxxx> Cc: Klaus Kusche <klaus.kusche@xxxxxxxxxxxxxxx> Cc: samitolvanen@xxxxxxxxxx Cc: Guenter Roeck <groeck@xxxxxxxxxx> Link: https://lkml.kernel.org/r/20190701155208.211815-1-zwisler@xxxxxxxxxx --- arch/x86/kernel/vmlinux.lds.S | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/x86/kernel/vmlinux.lds.S b/arch/x86/kernel/vmlinux.lds.S index 0850b5149345..4d1517022a14 100644 --- a/arch/x86/kernel/vmlinux.lds.S +++ b/arch/x86/kernel/vmlinux.lds.S @@ -141,10 +141,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
|