diff options
| author | Oliver Upton <oliver.upton@linux.dev> | 2023-02-13 22:30:07 +0000 |
|---|---|---|
| committer | Oliver Upton <oliver.upton@linux.dev> | 2023-02-13 22:30:17 +0000 |
| commit | 619cec00857f21dbc6db5ef9e0b9c613479f3745 (patch) | |
| tree | 046deb5e9b2056f4284681699b3c877f36b09843 /arch/arm64/include/asm/esr.h | |
| parent | 92425e058ab6ab1a4c4a9d384d2d86b810f57e23 (diff) | |
| parent | 9442d05bba6c12749fdc4039eddcf801398ec82b (diff) | |
| download | linux-619cec00857f21dbc6db5ef9e0b9c613479f3745.tar.gz | |
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/include/asm/esr.h')
| -rw-r--r-- | arch/arm64/include/asm/esr.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm64/include/asm/esr.h b/arch/arm64/include/asm/esr.h index 206de10524e3..c9f15b9e3c71 100644 --- a/arch/arm64/include/asm/esr.h +++ b/arch/arm64/include/asm/esr.h @@ -350,6 +350,7 @@ #define ESR_ELx_SME_ISS_ILL 1 #define ESR_ELx_SME_ISS_SM_DISABLED 2 #define ESR_ELx_SME_ISS_ZA_DISABLED 3 +#define ESR_ELx_SME_ISS_ZT_DISABLED 4 #ifndef __ASSEMBLY__ #include <asm/types.h> |