diff options
author | Takashi Iwai <tiwai@suse.de> | 2022-08-01 08:11:19 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2022-08-01 08:11:19 +0200 |
commit | 9769e44d41a1359b9000ff8458f0f2f66080ebf4 (patch) | |
tree | e91d2d71fd469c2fa9289fed87f0bb4fded196a5 /arch/arm64/kernel/mte.c | |
parent | f38e6458e16df7bac3871f4e69f9681c0b3c58bd (diff) | |
parent | be561ffad708f0cee18aee4231f80ffafaf7a419 (diff) |
Merge branch 'for-next' into for-linus
Diffstat (limited to 'arch/arm64/kernel/mte.c')
-rw-r--r-- | arch/arm64/kernel/mte.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm64/kernel/mte.c b/arch/arm64/kernel/mte.c index 57b30bcf9f21..f6b00743c399 100644 --- a/arch/arm64/kernel/mte.c +++ b/arch/arm64/kernel/mte.c @@ -244,6 +244,11 @@ static void mte_update_gcr_excl(struct task_struct *task) SYS_GCR_EL1); } +#ifdef CONFIG_KASAN_HW_TAGS +/* Only called from assembly, silence sparse */ +void __init kasan_hw_tags_enable(struct alt_instr *alt, __le32 *origptr, + __le32 *updptr, int nr_inst); + void __init kasan_hw_tags_enable(struct alt_instr *alt, __le32 *origptr, __le32 *updptr, int nr_inst) { @@ -252,6 +257,7 @@ void __init kasan_hw_tags_enable(struct alt_instr *alt, __le32 *origptr, if (kasan_hw_tags_enabled()) *updptr = cpu_to_le32(aarch64_insn_gen_nop()); } +#endif void mte_thread_init_user(void) { |