1 files changed, 2 insertions, 5 deletions

diff --git a/drivers/kvm/paging_tmpl.h b/drivers/kvm/paging_tmpl.h
index bab1b7f8d705..572e5b6d9a7a 100644
--- a/drivers/kvm/paging_tmpl.h
+++ b/drivers/kvm/paging_tmpl.h
@@ -72,8 +72,6 @@ static int FNAME(walk_addr)(struct guest_walker *walker,
                             struct kvm_vcpu *vcpu, gva_t addr,
                             int write_fault, int user_fault, int fetch_fault)
 {
-        hpa_t hpa;
-        struct kvm_memory_slot *slot;
         struct page *page;
         pt_element_t *table;
         pt_element_t pte;
@@ -105,9 +103,8 @@ static int FNAME(walk_addr)(struct guest_walker *walker,
                 pgprintk("%s: table_gfn[%d] %lx\n", __FUNCTION__,
                          walker->level - 1, table_gfn);
 
-                slot = gfn_to_memslot(vcpu->kvm, table_gfn);
-                hpa = safe_gpa_to_hpa(vcpu->kvm, pte & PT64_BASE_ADDR_MASK);
-                page = pfn_to_page(hpa >> PAGE_SHIFT);
+                page = gfn_to_page(vcpu->kvm, (pte & PT64_BASE_ADDR_MASK)
+                                   >> PAGE_SHIFT);
 
                 table = kmap_atomic(page, KM_USER0);
                 pte = table[index];