projects
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
742a15b
)
arm64: Ensure that the 'bti' macro is defined where linkage.h is included
author
Catalin Marinas
<catalin.marinas@arm.com>
Fri, 17 Dec 2021 16:20:45 +0000
(16:20 +0000)
committer
Catalin Marinas
<catalin.marinas@arm.com>
Fri, 17 Dec 2021 16:20:45 +0000
(16:20 +0000)
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>
arch/arm64/include/asm/linkage.h
patch
|
blob
|
history
diff --git
a/arch/arm64/include/asm/linkage.h
b/arch/arm64/include/asm/linkage.h
index 9065e4749b42a154efae495b7ce8ec24591c5ab0..b77e9b3f5371c9f38def6f6b4d3f66eb3557a875 100644
(file)
--- 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"