1 files changed, 12 insertions, 14 deletions

diff --git a/arch/x86/kvm/paging_tmpl.h b/arch/x86/kvm/paging_tmpl.h
index 3058a22a658d..6c9fed957cce 100644
--- a/arch/x86/kvm/paging_tmpl.h
+++ b/arch/x86/kvm/paging_tmpl.h
@@ -456,7 +456,7 @@ FNAME(prefetch_gpte)(struct kvm_vcpu *vcpu, struct kvm_mmu_page *sp,
 {
         unsigned pte_access;
         gfn_t gfn;
-        pfn_t pfn;
+        kvm_pfn_t pfn;
 
         if (FNAME(prefetch_invalid_gpte)(vcpu, sp, spte, gpte))
                 return false;
@@ -475,8 +475,8 @@ FNAME(prefetch_gpte)(struct kvm_vcpu *vcpu, struct kvm_mmu_page *sp,
          * we call mmu_set_spte() with host_writable = true because
          * pte_prefetch_gfn_to_pfn always gets a writable pfn.
          */
-        mmu_set_spte(vcpu, spte, pte_access, 0, NULL, PT_PAGE_TABLE_LEVEL,
-                     gfn, pfn, true, true);
+        mmu_set_spte(vcpu, spte, pte_access, 0, PT_PAGE_TABLE_LEVEL, gfn, pfn,
+                     true, true);
 
         return true;
 }
@@ -551,12 +551,12 @@ static void FNAME(pte_prefetch)(struct kvm_vcpu *vcpu, struct guest_walker *gw,
 static int FNAME(fetch)(struct kvm_vcpu *vcpu, gva_t addr,
                          struct guest_walker *gw,
                          int write_fault, int hlevel,
-                         pfn_t pfn, bool map_writable, bool prefault)
+                         kvm_pfn_t pfn, bool map_writable, bool prefault)
 {
         struct kvm_mmu_page *sp = NULL;
         struct kvm_shadow_walk_iterator it;
         unsigned direct_access, access = gw->pt_access;
-        int top_level, emulate = 0;
+        int top_level, emulate;
 
         direct_access = gw->pte_access;
 
@@ -587,7 +587,7 @@ static int FNAME(fetch)(struct kvm_vcpu *vcpu, gva_t addr,
                 if (!is_shadow_present_pte(*it.sptep)) {
                         table_gfn = gw->table_gfn[it.level - 2];
                         sp = kvm_mmu_get_page(vcpu, table_gfn, addr, it.level-1,
-                                              false, access, it.sptep);
+                                              false, access);
                 }
 
                 /*
@@ -598,7 +598,7 @@ static int FNAME(fetch)(struct kvm_vcpu *vcpu, gva_t addr,
                         goto out_gpte_changed;
 
                 if (sp)
-                        link_shadow_page(it.sptep, sp, PT_GUEST_ACCESSED_MASK);
+                        link_shadow_page(vcpu, it.sptep, sp);
         }
 
         for (;
@@ -617,20 +617,18 @@ static int FNAME(fetch)(struct kvm_vcpu *vcpu, gva_t addr,
                 direct_gfn = gw->gfn & ~(KVM_PAGES_PER_HPAGE(it.level) - 1);
 
                 sp = kvm_mmu_get_page(vcpu, direct_gfn, addr, it.level-1,
-                                      true, direct_access, it.sptep);
-                link_shadow_page(it.sptep, sp, PT_GUEST_ACCESSED_MASK);
+                                      true, direct_access);
+                link_shadow_page(vcpu, it.sptep, sp);
         }
 
         clear_sp_write_flooding_count(it.sptep);
-        mmu_set_spte(vcpu, it.sptep, gw->pte_access, write_fault, &emulate,
-                     it.level, gw->gfn, pfn, prefault, map_writable);
+        emulate = mmu_set_spte(vcpu, it.sptep, gw->pte_access, write_fault,
+                               it.level, gw->gfn, pfn, prefault, map_writable);
         FNAME(pte_prefetch)(vcpu, gw, it.sptep);
 
         return emulate;
 
 out_gpte_changed:
-        if (sp)
-                kvm_mmu_put_page(sp, it.sptep);
         kvm_release_pfn_clean(pfn);
         return 0;
 }
@@ -696,7 +694,7 @@ static int FNAME(page_fault)(struct kvm_vcpu *vcpu, gva_t addr, u32 error_code,
         int user_fault = error_code & PFERR_USER_MASK;
         struct guest_walker walker;
         int r;
-        pfn_t pfn;
+        kvm_pfn_t pfn;
         int level = PT_PAGE_TABLE_LEVEL;
         bool force_pt_level = false;
         unsigned long mmu_seq;