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>

diff --git a/arch/arm64/kernel/vmlinux.lds.S b/arch/arm64/kernel/vmlinux.lds.S
index 8bd8252..be8b285 100644 (file)
--- a/arch/arm64/kernel/vmlinux.lds.S
+++ b/arch/arm64/kernel/vmlinux.lds.S
@@ -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)