Update from 2.6.36 to 2.6.36.4wip-dissipation-jerickso

1 files changed, 7 insertions, 3 deletions

diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c
index 311f6dad8951..7fed5b793faf 100644
--- a/arch/x86/kvm/mmu.c
+++ b/arch/x86/kvm/mmu.c
@@ -2254,6 +2254,10 @@ static int mmu_alloc_roots(struct kvm_vcpu *vcpu)
                 return 0;
         }
         direct = !is_paging(vcpu);
+
+        if (mmu_check_root(vcpu, root_gfn))
+                return 1;
+
         for (i = 0; i < 4; ++i) {
                 hpa_t root = vcpu->arch.mmu.pae_root[i];
 
@@ -2265,13 +2269,13 @@ static int mmu_alloc_roots(struct kvm_vcpu *vcpu)
                                 continue;
                         }
                         root_gfn = pdptr >> PAGE_SHIFT;
+                        if (mmu_check_root(vcpu, root_gfn))
+                                return 1;
                 } else if (vcpu->arch.mmu.root_level == 0)
                         root_gfn = 0;
-                if (mmu_check_root(vcpu, root_gfn))
-                        return 1;
                 if (tdp_enabled) {
                         direct = 1;
-                        root_gfn = i << 30;
+                        root_gfn = i << (30 - PAGE_SHIFT);
                 }
                 spin_lock(&vcpu->kvm->mmu_lock);
                 kvm_mmu_free_some_pages(vcpu);