summaryrefslogtreecommitdiffstats
path: root/arch/arm64/tools/cpucaps
diff options
context:
space:
mode:
authorOliver Upton <oliver.upton@linux.dev>2023-02-13 23:30:07 +0100
committerOliver Upton <oliver.upton@linux.dev>2023-02-13 23:30:17 +0100
commit619cec00857f21dbc6db5ef9e0b9c613479f3745 (patch)
tree046deb5e9b2056f4284681699b3c877f36b09843 /arch/arm64/tools/cpucaps
parentMerge branch kvm/kvm-hw-enable-refactor into kvmarm/next (diff)
parentarm64/sme: Fix __finalise_el2 SMEver check (diff)
downloadlinux-619cec00857f21dbc6db5ef9e0b9c613479f3745.tar.xz
linux-619cec00857f21dbc6db5ef9e0b9c613479f3745.zip
Merge branch arm64/for-next/sme2 into kvmarm/next
Merge the SME2 branch to fix up a rather annoying conflict due to the EL2 finalization refactor. Signed-off-by: Oliver Upton <oliver.upton@linux.dev>
Diffstat (limited to 'arch/arm64/tools/cpucaps')
-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 dfeb2c51e257..37b6a1d8d8b0 100644
--- a/arch/arm64/tools/cpucaps
+++ b/arch/arm64/tools/cpucaps
@@ -50,6 +50,7 @@ MTE
MTE_ASYMM
SME
SME_FA64
+SME2
SPECTRE_V2
SPECTRE_V3A
SPECTRE_V4