On Mon, Jul 01, 2019 at 09:52:08AM -0600, Ross Zwisler wrote: > This reverts commit 392bef709659abea614abfe53cf228e7a59876a4. > > Per the discussion here: > > https://lkml.org/lkml/2019/6/20/830 > > the above referenced commit breaks kernel compilation with old GCC > toolchains as well as current versions of the Gold linker. Revert it so > we don't regress and lose the ability to compile the kernel with these > tools. > > Signed-off-by: Ross Zwisler <zwis...@google.com>
Acked-by: Kees Cook <keesc...@chromium.org> -Kees > --- > 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 > > -- > 2.20.1 -- Kees Cook
