summaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2016-08-18 12:19:19 +0200
committerPaolo Bonzini <pbonzini@redhat.com>2016-08-18 12:19:19 +0200
commit2eeb321fd2e24c0910e96e82509a961d1531fa29 (patch)
tree800cea75783554f02e9b0254707346d54516546e /arch/arm
parentc95ba92afb238ac565c68968fc72e38ca8d1b6e8 (diff)
parentf7f6f2d94f0027242ddfd665289b107a873fde43 (diff)
downloadlinux-2eeb321fd2e24c0910e96e82509a961d1531fa29.tar.bz2
Merge tag 'kvm-arm-for-v4.8-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD
KVM/ARM Fixes for v4.8-rc3 This tag contains the following fixes on top of v4.8-rc1: - ITS init issues - ITS error handling issues - ITS IRQ leakage fix - Plug a couple of ITS race conditions - An erratum workaround for timers - Some removal of misleading use of errors and comments - A fix for GICv3 on 32-bit guests
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/kvm/mmu.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/kvm/mmu.c b/arch/arm/kvm/mmu.c
index bda27b6b1aa2..29d0b23af2a9 100644
--- a/arch/arm/kvm/mmu.c
+++ b/arch/arm/kvm/mmu.c
@@ -1309,7 +1309,7 @@ static int user_mem_abort(struct kvm_vcpu *vcpu, phys_addr_t fault_ipa,
smp_rmb();
pfn = gfn_to_pfn_prot(kvm, gfn, write_fault, &writable);
- if (is_error_pfn(pfn))
+ if (is_error_noslot_pfn(pfn))
return -EFAULT;
if (kvm_is_device_pfn(pfn)) {