diff options
| author | Will Deacon <will.deacon@arm.com> | 2018-12-10 19:53:03 +0100 |
|---|---|---|
| committer | Will Deacon <will.deacon@arm.com> | 2018-12-10 19:53:52 +0100 |
| commit | bc84a2d106beab6000223b569c3bcb9ebf49d9ec (patch) | |
| tree | 41d5fee0c983a8820478c0c7e812b76be43ed07c /arch/arm64/include/asm/cpucaps.h | |
| parent | arm64: smp: Handle errors reported by the firmware (diff) | |
| parent | arm64: Add configuration/documentation for Cortex-A76 erratum 1165522 (diff) | |
| download | linux-bc84a2d106beab6000223b569c3bcb9ebf49d9ec.tar.xz linux-bc84a2d106beab6000223b569c3bcb9ebf49d9ec.zip | |
Merge branch 'kvm/cortex-a76-erratum-1165522' into aarch64/for-next/core
Pull in KVM workaround for A76 erratum #116522.
Conflicts:
arch/arm64/include/asm/cpucaps.h
Diffstat (limited to 'arch/arm64/include/asm/cpucaps.h')
| -rw-r--r-- | arch/arm64/include/asm/cpucaps.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm64/include/asm/cpucaps.h b/arch/arm64/include/asm/cpucaps.h index b7f0709a21af..a89f587d4842 100644 --- a/arch/arm64/include/asm/cpucaps.h +++ b/arch/arm64/include/asm/cpucaps.h @@ -55,7 +55,8 @@ #define ARM64_SSBS 34 #define ARM64_WORKAROUND_1188873 35 #define ARM64_HAS_SB 36 +#define ARM64_WORKAROUND_1165522 37 -#define ARM64_NCAPS 37 +#define ARM64_NCAPS 38 #endif /* __ASM_CPUCAPS_H */ |