From: Catalin Marinas <catalin.marinas@arm.com>
Date: Fri, 17 Dec 2021 16:20:45 +0000 (+0000)
Subject: arm64: Ensure that the 'bti' macro is defined where linkage.h is included
X-Git-Tag: baikal/mips/sdk6.1~6758^2^9
X-Git-Url: https://git.baikalelectronics.ru/sdk/?a=commitdiff_plain;h=54fc3a8ac322bb1d43efab9e76c06f3bf0ad5e0e;p=kernel.git

arm64: Ensure that the 'bti' macro is defined where linkage.h is included

Not all .S files include asm/assembler.h, however the SYM_FUNC_*
definitions invoke the 'bti' macro. Include asm/assembler.h in
asm/linkage.h.

Fixes: f68fa9a7de96 ("arm64: Add macro version of the BTI instruction")
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
---

diff --git a/arch/arm64/include/asm/linkage.h b/arch/arm64/include/asm/linkage.h
index 9065e4749b42a..b77e9b3f5371c 100644
--- a/arch/arm64/include/asm/linkage.h
+++ b/arch/arm64/include/asm/linkage.h
@@ -1,6 +1,10 @@
 #ifndef __ASM_LINKAGE_H
 #define __ASM_LINKAGE_H
 
+#ifdef __ASSEMBLY__
+#include <asm/assembler.h>
+#endif
+
 #define __ALIGN		.align 2
 #define __ALIGN_STR	".align 2"