Skip to content

Commit a6aadc2

Browse files
brooniewilldeacon
authored andcommitted
arm64: vdso: Annotate for BTI
Generate BTI annotations for all assembly files included in the 64 bit vDSO. Signed-off-by: Mark Brown <[email protected]> Reviewed-by: Catalin Marinas <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Will Deacon <[email protected]>
1 parent 3a9b136 commit a6aadc2

File tree

3 files changed

+9
-0
lines changed

3 files changed

+9
-0
lines changed

arch/arm64/kernel/vdso/note.S

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,12 @@
1212
#include <linux/version.h>
1313
#include <linux/elfnote.h>
1414
#include <linux/build-salt.h>
15+
#include <asm/assembler.h>
1516

1617
ELFNOTE_START(Linux, 0, "a")
1718
.long LINUX_VERSION_CODE
1819
ELFNOTE_END
1920

2021
BUILD_SALT
22+
23+
emit_aarch64_feature_1_and

arch/arm64/kernel/vdso/sigreturn.S

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
*/
1010

1111
#include <linux/linkage.h>
12+
#include <asm/assembler.h>
1213
#include <asm/unistd.h>
1314

1415
.text
@@ -24,3 +25,5 @@ SYM_FUNC_START(__kernel_rt_sigreturn)
2425
svc #0
2526
.cfi_endproc
2627
SYM_FUNC_END(__kernel_rt_sigreturn)
28+
29+
emit_aarch64_feature_1_and

arch/arm64/kernel/vdso/vdso.S

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
#include <linux/init.h>
99
#include <linux/linkage.h>
1010
#include <linux/const.h>
11+
#include <asm/assembler.h>
1112
#include <asm/page.h>
1213

1314
.globl vdso_start, vdso_end
@@ -19,3 +20,5 @@ vdso_start:
1920
vdso_end:
2021

2122
.previous
23+
24+
emit_aarch64_feature_1_and

0 commit comments

Comments
 (0)