UPSTREAM: 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.

Bug: 254441685
Fixes: 9be34be87c ("arm64: Add macro version of the BTI instruction")
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
(cherry picked from commit dd73d18e7f)
Signed-off-by: Lee Jones <joneslee@google.com>
Change-Id: I5dc6693315e56c36bd5c597a3b0de1655e11c7ba
This commit is contained in:
Catalin Marinas
2021-12-17 16:20:45 +00:00
committed by Treehugger Robot
parent 033dde8261
commit 17954359cf

View File

@@ -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"