diff options
| author | Steven Price <steven.price@arm.com> | 2019-12-16 11:56:29 +0000 |
|---|---|---|
| committer | Will Deacon <will@kernel.org> | 2020-01-16 10:43:53 +0000 |
| commit | e85d68faed4e79fd0b481c72de8245d4290369db (patch) | |
| tree | d1b63978e570436c05f0d946cd1f14644c7c0c6a /arch/arm64/include/asm/kvm_hyp.h | |
| parent | 46cf053efec6a3a5f343fead837777efe8252a46 (diff) | |
| download | linux-e85d68faed4e79fd0b481c72de8245d4290369db.tar.bz2 | |
arm64: Rename WORKAROUND_1165522 to SPECULATIVE_AT_VHE
Cortex-A55 is affected by a similar erratum, so rename the existing
workaround for errarum 1165522 so it can be used for both errata.
Acked-by: Marc Zyngier <maz@kernel.org>
Reviewed-by: Suzuki K Poulose <suzuki.poulose@arm.com>
Signed-off-by: Steven Price <steven.price@arm.com>
Signed-off-by: Will Deacon <will@kernel.org>
Diffstat (limited to 'arch/arm64/include/asm/kvm_hyp.h')
| -rw-r--r-- | arch/arm64/include/asm/kvm_hyp.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/include/asm/kvm_hyp.h b/arch/arm64/include/asm/kvm_hyp.h index 97f21cc66657..167a161dd596 100644 --- a/arch/arm64/include/asm/kvm_hyp.h +++ b/arch/arm64/include/asm/kvm_hyp.h @@ -95,7 +95,7 @@ static __always_inline void __hyp_text __load_guest_stage2(struct kvm *kvm) * before we can switch to the EL1/EL0 translation regime used by * the guest. */ - asm(ALTERNATIVE("nop", "isb", ARM64_WORKAROUND_1165522)); + asm(ALTERNATIVE("nop", "isb", ARM64_WORKAROUND_SPECULATIVE_AT_VHE)); } #endif /* __ARM64_KVM_HYP_H__ */ |