1 files changed, 3 insertions, 3 deletions

diff --git a/arch/x86/kvm/paging_tmpl.h b/arch/x86/kvm/paging_tmpl.h
index 8ebc3a5560ce..bf39d0f3efa9 100644
--- a/arch/x86/kvm/paging_tmpl.h
+++ b/arch/x86/kvm/paging_tmpl.h
@@ -744,9 +744,9 @@ static int FNAME(page_fault)(struct kvm_vcpu *vcpu, gva_t addr, u32 error_code,
               &walker, user_fault, &vcpu->arch.write_fault_to_shadow_pgtable);
 
         if (walker.level >= PT_DIRECTORY_LEVEL && !is_self_change_mapping) {
-                force_pt_level = mapping_level_dirty_bitmap(vcpu, walker.gfn);
-                if (!force_pt_level) {
-                        level = min(walker.level, mapping_level(vcpu, walker.gfn));
+                level = mapping_level(vcpu, walker.gfn, &force_pt_level);
+                if (likely(!force_pt_level)) {
+                        level = min(walker.level, level);
                         walker.gfn = walker.gfn & ~(KVM_PAGES_PER_HPAGE(level) - 1);
                 }
         } else