diff options
| author | Arvind Sankar <nivedita@alum.mit.edu> | 2020-02-25 00:21:29 +0100 |
|---|---|---|
| committer | Borislav Petkov <bp@suse.de> | 2020-02-25 14:51:29 +0100 |
| commit | 6f8f0dc980028e98ae339876a8403edae4d20e39 (patch) | |
| tree | f86a20da751cc3115543bc366d5c373f85b82cb8 /arch/x86/boot | |
| parent | x86/*/Makefile: Use -fno-asynchronous-unwind-tables to suppress .eh_frame sec... (diff) | |
| download | linux-6f8f0dc980028e98ae339876a8403edae4d20e39.tar.xz linux-6f8f0dc980028e98ae339876a8403edae4d20e39.zip | |
x86/vmlinux: Drop unneeded linker script discard of .eh_frame
Now that .eh_frame sections for the files in setup.elf and realmode.elf
are not generated anymore, the linker scripts don't need the special
output section name /DISCARD/ any more.
Remove the one in the main kernel linker script as well, since there are
no .eh_frame sections already, and fix up a comment referencing .eh_frame.
Update the comment in asm/dwarf2.h referring to .eh_frame so it continues
to make sense, as well as being more specific.
[ bp: Touch up commit message. ]
Signed-off-by: Arvind Sankar <nivedita@alum.mit.edu>
Signed-off-by: Borislav Petkov <bp@suse.de>
Reviewed-by: Nathan Chancellor <natechancellor@gmail.com>
Reviewed-by: Nick Desaulniers <ndesaulniers@google.com>
Reviewed-by: Kees Cook <keescook@chromium.org>
Tested-by: Nathan Chancellor <natechancellor@gmail.com>
Link: https://lkml.kernel.org/r/20200224232129.597160-3-nivedita@alum.mit.edu
Diffstat (limited to 'arch/x86/boot')
| -rw-r--r-- | arch/x86/boot/compressed/vmlinux.lds.S | 5 | ||||
| -rw-r--r-- | arch/x86/boot/setup.ld | 1 |
2 files changed, 0 insertions, 6 deletions
diff --git a/arch/x86/boot/compressed/vmlinux.lds.S b/arch/x86/boot/compressed/vmlinux.lds.S index 469dcf800a2c..508cfa6828c5 100644 --- a/arch/x86/boot/compressed/vmlinux.lds.S +++ b/arch/x86/boot/compressed/vmlinux.lds.S @@ -73,9 +73,4 @@ SECTIONS #endif . = ALIGN(PAGE_SIZE); /* keep ZO size page aligned */ _end = .; - - /* Discard .eh_frame to save some space */ - /DISCARD/ : { - *(.eh_frame) - } } diff --git a/arch/x86/boot/setup.ld b/arch/x86/boot/setup.ld index 3da1c37c6dd5..24c95522f231 100644 --- a/arch/x86/boot/setup.ld +++ b/arch/x86/boot/setup.ld @@ -52,7 +52,6 @@ SECTIONS _end = .; /DISCARD/ : { - *(.eh_frame) *(.note*) } |