diff options
| author |   Will Deacon <will@kernel.org> | 2020-01-22 11:35:05 +0000 |
|---|---|---|
| committer | Will Deacon <will@kernel.org> | 2020-01-22 11:35:05 +0000 |
| commit | ab3906c53144837f1a192b5c3ba71ec2f938c187 (patch) | |
| tree | e18d092c350cd73e4c4947193710baf544da59f6 /arch/arm64/include/asm/cpucaps.h | |
| parent | Merge branch 'for-next/asm-annotations' into for-next/core (diff) | |
| parent | arm64: Workaround for Cortex-A55 erratum 1530923 (diff) | |
| download | linux-dev-ab3906c53144837f1a192b5c3ba71ec2f938c187.tar.xz linux-dev-ab3906c53144837f1a192b5c3ba71ec2f938c187.zip | |
Merge branch 'for-next/errata' into for-next/core
* for-next/errata: (3 commits)
arm64: Workaround for Cortex-A55 erratum 1530923
...
Diffstat (limited to 'arch/arm64/include/asm/cpucaps.h')
| -rw-r--r-- | arch/arm64/include/asm/cpucaps.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm64/include/asm/cpucaps.h b/arch/arm64/include/asm/cpucaps.h index 33ff25c1ab1b..a61c33611e39 100644 --- a/arch/arm64/include/asm/cpucaps.h +++ b/arch/arm64/include/asm/cpucaps.h @@ -44,7 +44,7 @@ #define ARM64_SSBS 34 #define ARM64_WORKAROUND_1418040 35 #define ARM64_HAS_SB 36 -#define ARM64_WORKAROUND_1165522 37 +#define ARM64_WORKAROUND_SPECULATIVE_AT_VHE 37 #define ARM64_HAS_ADDRESS_AUTH_ARCH 38 #define ARM64_HAS_ADDRESS_AUTH_IMP_DEF 39 #define ARM64_HAS_GENERIC_AUTH_ARCH 40 @@ -55,7 +55,7 @@ #define ARM64_WORKAROUND_CAVIUM_TX2_219_TVM 45 #define ARM64_WORKAROUND_CAVIUM_TX2_219_PRFM 46 #define ARM64_WORKAROUND_1542419 47 -#define ARM64_WORKAROUND_1319367 48 +#define ARM64_WORKAROUND_SPECULATIVE_AT_NVHE 48 #define ARM64_HAS_E0PD 49 #define ARM64_NCAPS 50 |