diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2021-07-19 16:05:40 +0200 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2021-07-19 16:05:40 +0200 |
| commit | 7025098af33430b302d3c2d78ef12327c60ee8f9 (patch) | |
| tree | bfd8c958580e5edad7b3dac391d43efc39a63088 /arch | |
| parent | Linux 5.14-rc2 (diff) | |
| parent | KVM: arm64: selftests: get-reg-list: actually enable pmu regs in pmu sublist (diff) | |
| download | linux-7025098af33430b302d3c2d78ef12327c60ee8f9.tar.xz linux-7025098af33430b302d3c2d78ef12327c60ee8f9.zip | |
Merge tag 'kvmarm-fixes-5.14-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD
KVM/arm64 fixes for 5.14, take #1
- Fix MTE shared page detection
- Fix selftest use of obsolete pthread_yield() in favour of sched_yield()
- Enable selftest's use of PMU registers when asked to
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm64/kvm/mmu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/kvm/mmu.c b/arch/arm64/kvm/mmu.c index 3155c9e778f0..0625bf2353c2 100644 --- a/arch/arm64/kvm/mmu.c +++ b/arch/arm64/kvm/mmu.c @@ -947,7 +947,7 @@ static int user_mem_abort(struct kvm_vcpu *vcpu, phys_addr_t fault_ipa, vma_shift = get_vma_page_shift(vma, hva); } - shared = (vma->vm_flags & VM_PFNMAP); + shared = (vma->vm_flags & VM_SHARED); switch (vma_shift) { #ifndef __PAGETABLE_PMD_FOLDED |