diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2020-11-08 04:15:53 -0500 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2020-11-08 04:15:53 -0500 |
| commit | ff2bb93f53782bbf7500d521368435921912ad04 (patch) | |
| tree | 67cabf56301b5172c622b005a3135e56cabd70b9 /arch/arm64/kvm/mmu.c | |
| parent | 9478dec3b5e79a1431e2e2b911e32e52a11c6320 (diff) | |
| parent | c512298eed0360923d0cbc4a1f30bc0509af0d50 (diff) | |
| download | linux-ff2bb93f53782bbf7500d521368435921912ad04.tar.bz2 | |
Merge tag 'kvmarm-fixes-5.10-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD
KVM/arm64 fixes for v5.10, take #2
- Fix compilation error when PMD and PUD are folded
- Fix regresssion of the RAZ behaviour of ID_AA64ZFR0_EL1
Diffstat (limited to 'arch/arm64/kvm/mmu.c')
| -rw-r--r-- | arch/arm64/kvm/mmu.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm64/kvm/mmu.c b/arch/arm64/kvm/mmu.c index 57972bdb213a..1a01da9fdc99 100644 --- a/arch/arm64/kvm/mmu.c +++ b/arch/arm64/kvm/mmu.c @@ -788,10 +788,12 @@ static int user_mem_abort(struct kvm_vcpu *vcpu, phys_addr_t fault_ipa, } switch (vma_shift) { +#ifndef __PAGETABLE_PMD_FOLDED case PUD_SHIFT: if (fault_supports_stage2_huge_mapping(memslot, hva, PUD_SIZE)) break; fallthrough; +#endif case CONT_PMD_SHIFT: vma_shift = PMD_SHIFT; fallthrough; |