KVM: x86: Remove useless regs_page pointer from kvm_lapic

[pandora-kernel.git] / arch / x86 / kvm / lapic.c

diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c
index 0171e66..2b2255b 100644 (file)
--- a/arch/x86/kvm/lapic.c
+++ b/arch/x86/kvm/lapic.c
@@ -871,8 +871,8 @@ void kvm_free_lapic(struct kvm_vcpu *vcpu)
 
        hrtimer_cancel(&vcpu->arch.apic->lapic_timer.timer);
 
-       if (vcpu->arch.apic->regs_page)
-               __free_page(vcpu->arch.apic->regs_page);
+       if (vcpu->arch.apic->regs)
+               free_page((unsigned long)vcpu->arch.apic->regs);
 
        kfree(vcpu->arch.apic);
 }
@@ -1061,13 +1061,12 @@ int kvm_create_lapic(struct kvm_vcpu *vcpu)
 
        vcpu->arch.apic = apic;
 
-       apic->regs_page = alloc_page(GFP_KERNEL|__GFP_ZERO);
-       if (apic->regs_page == NULL) {
+       apic->regs = (void *)get_zeroed_page(GFP_KERNEL);
+       if (!apic->regs) {
                printk(KERN_ERR "malloc apic regs error for vcpu %x\n",
                       vcpu->vcpu_id);
                goto nomem_free_apic;
        }
-       apic->regs = page_address(apic->regs_page);
        apic->vcpu = vcpu;
 
        hrtimer_init(&apic->lapic_timer.timer, CLOCK_MONOTONIC,