Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Ard Biesheuvel and committed by
Will Deacon
1eae811d 4cf23494

+2 -8
+2 -8
arch/arm64/kernel/vmlinux.lds.S
··· 17 17 18 18 #include "image.h" 19 19 20 - /* .exit.text needed in case of alternative patching */ 21 - #define ARM_EXIT_KEEP(x) x 22 - #define ARM_EXIT_DISCARD(x) 23 - 24 20 OUTPUT_ARCH(aarch64) 25 21 ENTRY(_text) 26 22 ··· 91 95 * order of matching. 92 96 */ 93 97 /DISCARD/ : { 94 - ARM_EXIT_DISCARD(EXIT_TEXT) 95 - ARM_EXIT_DISCARD(EXIT_DATA) 96 98 EXIT_CALL 97 99 *(.discard) 98 100 *(.discard.*) ··· 155 161 156 162 __exittext_begin = .; 157 163 .exit.text : { 158 - ARM_EXIT_KEEP(EXIT_TEXT) 164 + EXIT_TEXT 159 165 } 160 166 __exittext_end = .; 161 167 ··· 182 188 *(.init.rodata.* .init.bss) /* from the EFI stub */ 183 189 } 184 190 .exit.data : { 185 - ARM_EXIT_KEEP(EXIT_DATA) 191 + EXIT_DATA 186 192 } 187 193 188 194 PERCPU_SECTION(L1_CACHE_BYTES)