diff options
| author | Christian Borntraeger <borntraeger@de.ibm.com> | 2012-09-27 17:29:45 +0200 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2012-09-27 18:19:53 +0200 |
| commit | 3d11df7abbff013b811d5615320580cd5d9d7d31 (patch) | |
| tree | cd0669e024ea63d15163f56a48f44f860eae39e5 /arch/s390/kvm | |
| parent | c863901075a42d50678616d8ee4b96ef13080498 (diff) | |
| download | blackbird-op-linux-3d11df7abbff013b811d5615320580cd5d9d7d31.tar.gz blackbird-op-linux-3d11df7abbff013b811d5615320580cd5d9d7d31.zip | |
KVM: s390: Fix vcpu_load handling in interrupt code
Recent changes (KVM: make processes waiting on vcpu mutex killable)
now requires to check the return value of vcpu_load. This triggered
a warning in s390 specific kvm code. Turns out that we can actually
remove the put/load, since schedule will do the right thing via
the preempt notifiers.
Reported-by: Fengguang Wu <fengguang.wu@intel.com>
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'arch/s390/kvm')
| -rw-r--r-- | arch/s390/kvm/interrupt.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/s390/kvm/interrupt.c b/arch/s390/kvm/interrupt.c index 7556231fb073..ff1e2f8ef94a 100644 --- a/arch/s390/kvm/interrupt.c +++ b/arch/s390/kvm/interrupt.c @@ -423,9 +423,7 @@ no_timer: 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); } |
