summaryrefslogtreecommitdiff
path: root/arch/arm64/include/asm/linkage.h
diff options
context:
space:
mode:
authorCatalin Marinas <catalin.marinas@arm.com>2021-12-17 16:20:45 +0000
committerCatalin Marinas <catalin.marinas@arm.com>2021-12-17 16:20:45 +0000
commitdd73d18e7fc7adc7e70711ff2c92373ce8862c3f (patch)
tree8477e93101bb165ccb46451c118cd591eabfd07d /arch/arm64/include/asm/linkage.h
parent742a15b1a23aa43bde2d9d681281ec1925be13fd (diff)
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: 9be34be87cc8 ("arm64: Add macro version of the BTI instruction") Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Diffstat (limited to 'arch/arm64/include/asm/linkage.h')
-rw-r--r--arch/arm64/include/asm/linkage.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm64/include/asm/linkage.h b/arch/arm64/include/asm/linkage.h
index 9065e4749b42..b77e9b3f5371 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"