1 files changed, 11 insertions, 11 deletions

diff --git a/drivers/kvm/mmu.c b/drivers/kvm/mmu.c
index 3d367cbfe1f9..790423c5f23d 100644
--- a/drivers/kvm/mmu.c
+++ b/drivers/kvm/mmu.c
@@ -578,7 +578,7 @@ static int init_kvm_mmu(struct kvm_vcpu *vcpu)
 
         if (!is_paging(vcpu))
                 return nonpaging_init_context(vcpu);
-        else if (kvm_arch_ops->is_long_mode(vcpu))
+        else if (is_long_mode(vcpu))
                 return paging64_init_context(vcpu);
         else if (is_pae(vcpu))
                 return paging32E_init_context(vcpu);
@@ -639,22 +639,22 @@ error_1:
         return -ENOMEM;
 }
 
-int kvm_mmu_init(struct kvm_vcpu *vcpu)
+int kvm_mmu_create(struct kvm_vcpu *vcpu)
 {
-        int r;
-
         ASSERT(vcpu);
         ASSERT(!VALID_PAGE(vcpu->mmu.root_hpa));
         ASSERT(list_empty(&vcpu->free_pages));
 
-        if ((r = alloc_mmu_pages(vcpu)))
-                return r;
+        return alloc_mmu_pages(vcpu);
+}
 
-        if ((r = init_kvm_mmu(vcpu))) {
-                free_mmu_pages(vcpu);
-                return r;
-        }
-        return 0;
+int kvm_mmu_setup(struct kvm_vcpu *vcpu)
+{
+        ASSERT(vcpu);
+        ASSERT(!VALID_PAGE(vcpu->mmu.root_hpa));
+        ASSERT(!list_empty(&vcpu->free_pages));
+
+        return init_kvm_mmu(vcpu);
 }
 
 void kvm_mmu_destroy(struct kvm_vcpu *vcpu)