summaryrefslogtreecommitdiffstats
path: root/arch/arm64/kernel/vdso/vdso.S
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2020-05-06 20:51:36 +0100
committerWill Deacon <will@kernel.org>2020-05-07 17:53:20 +0100
commita6aadc28278a05f394c9353460ec74610ddf7ac6 (patch)
tree52932bd7c6f9147c6c6466cd20878d8661c81317 /arch/arm64/kernel/vdso/vdso.S
parent3a9b136c998fc990cbde1a3cbc343050de704d6b (diff)
downloadlinux-a6aadc28278a05f394c9353460ec74610ddf7ac6.tar.bz2
arm64: vdso: Annotate for BTI
Generate BTI annotations for all assembly files included in the 64 bit vDSO. Signed-off-by: Mark Brown <broonie@kernel.org> Reviewed-by: Catalin Marinas <catalin.marinas@arm.com> Link: https://lore.kernel.org/r/20200506195138.22086-10-broonie@kernel.org Signed-off-by: Will Deacon <will@kernel.org>
Diffstat (limited to 'arch/arm64/kernel/vdso/vdso.S')
-rw-r--r--arch/arm64/kernel/vdso/vdso.S3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm64/kernel/vdso/vdso.S b/arch/arm64/kernel/vdso/vdso.S
index d1414fee5274..c4b1990bf2be 100644
--- a/arch/arm64/kernel/vdso/vdso.S
+++ b/arch/arm64/kernel/vdso/vdso.S
@@ -8,6 +8,7 @@
#include <linux/init.h>
#include <linux/linkage.h>
#include <linux/const.h>
+#include <asm/assembler.h>
#include <asm/page.h>
.globl vdso_start, vdso_end
@@ -19,3 +20,5 @@ vdso_start:
vdso_end:
.previous
+
+emit_aarch64_feature_1_and