From: Will Deacon <will.deacon@arm.com>
Date: Tue, 25 Nov 2014 15:26:13 +0000 (+0000)
Subject: arm64: vmlinux.lds.S: don't discard .exit.* sections at link-time
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=07c802bd7c3951410b105356787d655e273ab537;p=deliverable%2Flinux.git

arm64: vmlinux.lds.S: don't discard .exit.* sections at link-time

.exit.* sections may be subject to patching by the new alternatives
framework and so shouldn't be discarded at link-time. Without this patch,
such a section will result in the following linker error:

`.exit.text' referenced in section `.altinstructions' of
 drivers/built-in.o: defined in discarded section `.exit.text' of
drivers/built-in.o

Signed-off-by: Will Deacon <will.deacon@arm.com>
---

diff --git a/arch/arm64/kernel/vmlinux.lds.S b/arch/arm64/kernel/vmlinux.lds.S
index 3236727be2b9..9965ec87cbec 100644
--- a/arch/arm64/kernel/vmlinux.lds.S
+++ b/arch/arm64/kernel/vmlinux.lds.S
@@ -11,8 +11,9 @@
 
 #include "image.h"
 
-#define ARM_EXIT_KEEP(x)
-#define ARM_EXIT_DISCARD(x)	x
+/* .exit.text needed in case of alternative patching */
+#define ARM_EXIT_KEEP(x)	x
+#define ARM_EXIT_DISCARD(x)
 
 OUTPUT_ARCH(aarch64)
 ENTRY(_text)