openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

arm64/kernel: vmlinux.lds: drop redundant discard/keep macros 

ARM_EXIT_KEEP and ARM_EXIT_DISCARD are always defined in the same way,
so we don't really need them in the first place.

Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
Acked-by: Mark Rutland <mark.rutland@arm.com>
Link: https://lore.kernel.org/r/20200416132730.25290-1-ardb@kernel.org
Signed-off-by: Will Deacon <will@kernel.org>
This commit is contained in:
Ard Biesheuvel 2020-04-16 15:27:30 +02:00 committed by Will Deacon
parent 4cf234943d
commit 1eae811da6
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
arch/arm64/kernel/vmlinux.lds.S
View File

@ -17,10 +17,6 @@
#include "image.h" #include "image.h"
/* .exit.text needed in case of alternative patching */
#define ARM_EXIT_KEEP(x) x
#define ARM_EXIT_DISCARD(x)
OUTPUT_ARCH(aarch64) OUTPUT_ARCH(aarch64)
ENTRY(_text) ENTRY(_text)
@ -95,8 +91,6 @@ SECTIONS
* order of matching. * order of matching.
*/ */
/DISCARD/ : { /DISCARD/ : {
ARM_EXIT_DISCARD(EXIT_TEXT)
ARM_EXIT_DISCARD(EXIT_DATA)
EXIT_CALL EXIT_CALL
*(.discard) *(.discard)
*(.discard.*) *(.discard.*)
@ -161,7 +155,7 @@ SECTIONS
__exittext_begin = .; __exittext_begin = .;
.exit.text : { .exit.text : {
ARM_EXIT_KEEP(EXIT_TEXT) EXIT_TEXT
} }
__exittext_end = .; __exittext_end = .;
@ -188,7 +182,7 @@ SECTIONS
*(.init.rodata.* .init.bss) /* from the EFI stub */ *(.init.rodata.* .init.bss) /* from the EFI stub */
} }
.exit.data : { .exit.data : {
ARM_EXIT_KEEP(EXIT_DATA) EXIT_DATA
} }
PERCPU_SECTION(L1_CACHE_BYTES) PERCPU_SECTION(L1_CACHE_BYTES)