projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'misc.namei' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
[linux-2.6-microblaze.git]
/
arch
/
x86
/
kvm
/
mmu
/
paging_tmpl.h
diff --git
a/arch/x86/kvm/mmu/paging_tmpl.h
b/arch/x86/kvm/mmu/paging_tmpl.h
index
ee044d3
..
7d03e9b
100644
(file)
--- a/
arch/x86/kvm/mmu/paging_tmpl.h
+++ b/
arch/x86/kvm/mmu/paging_tmpl.h
@@
-881,9
+881,9
@@
static int FNAME(page_fault)(struct kvm_vcpu *vcpu, gpa_t addr, u32 error_code,
mmu_seq = vcpu->kvm->mmu_notifier_seq;
smp_rmb();
mmu_seq = vcpu->kvm->mmu_notifier_seq;
smp_rmb();
- if (
try_async_pf
(vcpu, prefault, walker.gfn, addr, &pfn, &hva,
- write_fault, &map_writable))
- return
RET_PF_RETRY
;
+ if (
kvm_faultin_pfn
(vcpu, prefault, walker.gfn, addr, &pfn, &hva,
+ write_fault, &map_writable
, &r
))
+ return
r
;
if (handle_abnormal_pfn(vcpu, addr, walker.gfn, pfn, walker.pte_access, &r))
return r;
if (handle_abnormal_pfn(vcpu, addr, walker.gfn, pfn, walker.pte_access, &r))
return r;