projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[cascardo/linux.git]
/
arch
/
arm
/
kvm
/
mmu.c
diff --git
a/arch/arm/kvm/mmu.c
b/arch/arm/kvm/mmu.c
index
bda27b6
..
29d0b23
100644
(file)
--- 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)) {