From: Joey Gouly Date: Thu, 22 Aug 2024 15:10:55 +0000 (+0100) Subject: arm64: re-order MTE VM_ flags X-Git-Tag: v6.12-rc1~221^2~2^2~18 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=facaa1373c9aabf8e34109a9cb205ad0f3a8584e;p=thirdparty%2Fkernel%2Flinux.git 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 Cc: Catalin Marinas Cc: Will Deacon Acked-by: Catalin Marinas Link: https://lore.kernel.org/r/20240822151113.1479789-13-joey.gouly@arm.com Signed-off-by: Will Deacon --- diff --git a/include/linux/mm.h b/include/linux/mm.h index fb6ccd93f5891..406512c16471a 100644 --- 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