anierin/msm-5.15
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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: 9be34be87cc8 ("arm64: Add macro version of the BTI instruction")
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
(cherry picked from commit dd73d18e7fc7adc7e70711ff2c92373ce8862c3f)
Signed-off-by: Lee Jones <joneslee@google.com>
Change-Id: Ifa5f046d647a3ede82565436a70def87cf1b7ba2
This commit is contained in:
Catalin Marinas
2021-12-17 16:20:45 +00:00
committed by Lee Jones
parent 03a56596ef
commit 435eac40de
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm64/include/asm/linkage.h
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"