arm64: re-order MTE VM_ flags

VM_PKEY_BIT[012] will use VM_HIGH_ARCH_[012], move the MTE VM flags to
accommodate this.

Signed-off-by: Joey Gouly <joey.gouly@arm.com>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Will Deacon <will@kernel.org>
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Link: https://lore.kernel.org/r/20240822151113.1479789-13-joey.gouly@arm.com
Signed-off-by: Will Deacon <will@kernel.org>

diff --git a/include/linux/mm.h b/include/linux/mm.h
index fb6ccd93f58915a3c7be4ad5ce47d778bff949ae..406512c16471a7aa79af0628787f77d031ed6ee8 100644 (file)
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -378,8 +378,8 @@ extern unsigned int kobjsize(const void *objp);
 #endif
 
 #if defined(CONFIG_ARM64_MTE)
-# define VM_MTE                VM_HIGH_ARCH_0  /* Use Tagged memory for access control */
-# define VM_MTE_ALLOWED        VM_HIGH_ARCH_1  /* Tagged memory permitted */
+# define VM_MTE                VM_HIGH_ARCH_4  /* Use Tagged memory for access control */
+# define VM_MTE_ALLOWED        VM_HIGH_ARCH_5  /* Tagged memory permitted */
 #else
 # define VM_MTE                VM_NONE
 # define VM_MTE_ALLOWED        VM_NONE