summaryrefslogtreecommitdiff
path: root/arch/arm64/tools
diff options
context:
space:
mode:
authorWill Deacon <will@kernel.org>2021-10-29 14:25:08 +0300
committerWill Deacon <will@kernel.org>2021-10-29 14:25:08 +0300
commit7066248c44ee4392b6831b2ede0ce57891202de0 (patch)
treeb043c40d932283f93e1bceeea56a1615c4b48f85 /arch/arm64/tools
parentdc6bab18fb3c9dfde892cef2b1fe73565ff1f91a (diff)
parent2d27e585147395316289c63efc932984675c65c2 (diff)
downloadlinux-7066248c44ee4392b6831b2ede0ce57891202de0.tar.xz
Merge branch 'for-next/mte' into for-next/core
* for-next/mte: kasan: Extend KASAN mode kernel parameter arm64: mte: Add asymmetric mode support arm64: mte: CPU feature detection for Asymm MTE arm64: mte: Bitfield definitions for Asymm MTE kasan: Remove duplicate of kasan_flag_async arm64: kasan: mte: move GCR_EL1 switch to task switch when KASAN disabled
Diffstat (limited to 'arch/arm64/tools')
-rw-r--r--arch/arm64/tools/cpucaps1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm64/tools/cpucaps b/arch/arm64/tools/cpucaps
index 7a7c58acd8f0..e91795d1a8a3 100644
--- a/arch/arm64/tools/cpucaps
+++ b/arch/arm64/tools/cpucaps
@@ -40,6 +40,7 @@ HW_DBM
KVM_PROTECTED_MODE
MISMATCHED_CACHE_TYPE
MTE
+MTE_ASYMM
SPECTRE_V2
SPECTRE_V3A
SPECTRE_V4