Merge tag 'mm-stable-2023-04-27-15-30' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-block.git] / arch / arm64 / include / asm / memory.h

diff --git a/arch/arm64/include/asm/memory.h b/arch/arm64/include/asm/memory.h
index efcd68154a3a33580da7f98897942e4bb7e2bbca..c735afdf639b191519b4d68ea6d70e276c46010e 100644 (file)
--- a/arch/arm64/include/asm/memory.h
+++ b/arch/arm64/include/asm/memory.h
@@ -261,9 +261,11 @@ static inline const void *__tag_set(const void *addr, u8 tag)
 }
 
 #ifdef CONFIG_KASAN_HW_TAGS
-#define arch_enable_tagging_sync()             mte_enable_kernel_sync()
-#define arch_enable_tagging_async()            mte_enable_kernel_async()
-#define arch_enable_tagging_asymm()            mte_enable_kernel_asymm()
+#define arch_enable_tag_checks_sync()          mte_enable_kernel_sync()
+#define arch_enable_tag_checks_async()         mte_enable_kernel_async()
+#define arch_enable_tag_checks_asymm()         mte_enable_kernel_asymm()
+#define arch_suppress_tag_checks_start()       mte_enable_tco()
+#define arch_suppress_tag_checks_stop()                mte_disable_tco()
 #define arch_force_async_tag_fault()           mte_check_tfsr_exit()
 #define arch_get_random_tag()                  mte_get_random_tag()
 #define arch_get_mem_tag(addr)                 mte_get_mem_tag(addr)