Merge branch 'x86-fixes-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-2.6-omap-h63xx.git] / arch / ia64 / kvm / process.c

diff --git a/arch/ia64/kvm/process.c b/arch/ia64/kvm/process.c
index 5a33f7ed29a0af4b3410f9fa1259b839f657eefa..800817307b7b9da774cb678373476537b2c1e28e 100644 (file)
--- a/arch/ia64/kvm/process.c
+++ b/arch/ia64/kvm/process.c
@@ -713,7 +713,7 @@ void leave_hypervisor_tail(void)
                                if (!(VCPU(v, itv) & (1 << 16))) {
                                        vcpu_pend_interrupt(v, VCPU(v, itv)
                                                        & 0xff);
-                               VMX(v, itc_check) = 0;
+                                       VMX(v, itc_check) = 0;
                                } else {
                                        v->arch.timer_pending = 1;
                                }
@@ -962,9 +962,9 @@ static void kvm_do_resume_op(struct kvm_vcpu *vcpu)
 void vmm_transition(struct kvm_vcpu *vcpu)
 {
        ia64_call_vsa(PAL_VPS_SAVE, (unsigned long)vcpu->arch.vpd,
-                       0, 0, 0, 0, 0, 0);
+                       1, 0, 0, 0, 0, 0);
        vmm_trampoline(&vcpu->arch.guest, &vcpu->arch.host);
        ia64_call_vsa(PAL_VPS_RESTORE, (unsigned long)vcpu->arch.vpd,
-                                               0, 0, 0, 0, 0, 0);
+                                               1, 0, 0, 0, 0, 0);
        kvm_do_resume_op(vcpu);
 }