Commit 1eae811d authored by Ard Biesheuvel's avatar Ard Biesheuvel Committed by Will Deacon
Browse files

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: default avatarArd Biesheuvel <ardb@kernel.org>
Acked-by: default avatarMark Rutland <mark.rutland@arm.com>
Link: https://lore.kernel.org/r/20200416132730.25290-1-ardb@kernel.org


Signed-off-by: default avatarWill Deacon <will@kernel.org>
parent 4cf23494
Loading
Loading
Loading
Loading
+2 −8
Original line number Diff line number Diff line
@@ -17,10 +17,6 @@

#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)
ENTRY(_text)

@@ -95,8 +91,6 @@ SECTIONS
	 * order of matching.
	 */
	/DISCARD/ : {
		ARM_EXIT_DISCARD(EXIT_TEXT)
		ARM_EXIT_DISCARD(EXIT_DATA)
		EXIT_CALL
		*(.discard)
		*(.discard.*)
@@ -161,7 +155,7 @@ SECTIONS

	__exittext_begin = .;
	.exit.text : {
		ARM_EXIT_KEEP(EXIT_TEXT)
		EXIT_TEXT
	}
	__exittext_end = .;

@@ -188,7 +182,7 @@ SECTIONS
		*(.init.rodata.* .init.bss)	/* from the EFI stub */
	}
	.exit.data : {
		ARM_EXIT_KEEP(EXIT_DATA)
		EXIT_DATA
	}

	PERCPU_SECTION(L1_CACHE_BYTES)