Merge branch 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6

[~andy/linux] / arch / ia64 / kvm / kvm-ia64.c

diff --git a/arch/ia64/kvm/kvm-ia64.c b/arch/ia64/kvm/kvm-ia64.c
index 70d224d4264ceebaa59c06604ec628558b01e485..8213efe1998c16eade6966acd1cf1b5b22d489a8 100644 (file)
--- a/arch/ia64/kvm/kvm-ia64.c
+++ b/arch/ia64/kvm/kvm-ia64.c
@@ -662,6 +662,7 @@ again:
                goto vcpu_run_fail;
 
        srcu_read_unlock(&vcpu->kvm->srcu, idx);
+       vcpu->mode = IN_GUEST_MODE;
        kvm_guest_enter();
 
        /*
@@ -683,6 +684,7 @@ again:
         */
        barrier();
        kvm_guest_exit();
+       vcpu->mode = OUTSIDE_GUEST_MODE;
        preempt_enable();
 
        idx = srcu_read_lock(&vcpu->kvm->srcu);