From 3c9a057db34e3cee2b9842804f31cea3a31f78e2 Mon Sep 17 00:00:00 2001 From: Christian Borntraeger Date: Thu, 27 Sep 2012 17:29:45 +0200 Subject: [PATCH] --- yaml --- r: 329930 b: refs/heads/master c: 3d11df7abbff013b811d5615320580cd5d9d7d31 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/s390/kvm/interrupt.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 5bb4b80ead22..eda3dc7fc2d5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c863901075a42d50678616d8ee4b96ef13080498 +refs/heads/master: 3d11df7abbff013b811d5615320580cd5d9d7d31 diff --git a/trunk/arch/s390/kvm/interrupt.c b/trunk/arch/s390/kvm/interrupt.c index 7556231fb073..ff1e2f8ef94a 100644 --- a/trunk/arch/s390/kvm/interrupt.c +++ b/trunk/arch/s390/kvm/interrupt.c @@ -423,9 +423,7 @@ int kvm_s390_handle_wait(struct kvm_vcpu *vcpu) set_current_state(TASK_INTERRUPTIBLE); spin_unlock_bh(&vcpu->arch.local_int.lock); spin_unlock(&vcpu->arch.local_int.float_int->lock); - vcpu_put(vcpu); schedule(); - vcpu_load(vcpu); spin_lock(&vcpu->arch.local_int.float_int->lock); spin_lock_bh(&vcpu->arch.local_int.lock); }