diff options
| author | Will Deacon <will@kernel.org> | 2020-05-28 18:02:51 +0100 |
|---|---|---|
| committer | Will Deacon <will@kernel.org> | 2020-05-28 18:02:51 +0100 |
| commit | c350717ec7de67daad26d996efe7f3d97d95aa9c (patch) | |
| tree | d52adde14dec02a415ef4a255027997c160452bc /arch/arm64/include/asm/kvm_host.h | |
| parent | d27865279f12035c730818aa1a0280fada866a37 (diff) | |
| parent | fe677be989146b8a8c0f26fe626c6567c4cd3837 (diff) | |
| download | linux-c350717ec7de67daad26d996efe7f3d97d95aa9c.tar.gz linux-c350717ec7de67daad26d996efe7f3d97d95aa9c.tar.bz2 linux-c350717ec7de67daad26d996efe7f3d97d95aa9c.zip | |
Merge branch 'for-next/kvm/errata' into for-next/core
KVM CPU errata rework
(Andrew Scull and Marc Zyngier)
* for-next/kvm/errata:
KVM: arm64: Move __load_guest_stage2 to kvm_mmu.h
arm64: Unify WORKAROUND_SPECULATIVE_AT_{NVHE,VHE}
Diffstat (limited to 'arch/arm64/include/asm/kvm_host.h')
| -rw-r--r-- | arch/arm64/include/asm/kvm_host.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/arm64/include/asm/kvm_host.h b/arch/arm64/include/asm/kvm_host.h index 7dd8fefa6aec..57c0afcf9dcf 100644 --- a/arch/arm64/include/asm/kvm_host.h +++ b/arch/arm64/include/asm/kvm_host.h @@ -573,10 +573,6 @@ static inline bool kvm_arch_requires_vhe(void) if (system_supports_sve()) return true; - /* Some implementations have defects that confine them to VHE */ - if (cpus_have_cap(ARM64_WORKAROUND_SPECULATIVE_AT_VHE)) - return true; - return false; } |