summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJens Freimann2014-08-11 15:39:43 +0200
committerChristian Borntraeger2014-08-25 14:35:56 +0200
commit331cbc277ec4ae5827b9ca538d9b5469fdca0947 (patch)
tree21007a8c70159b2f76428251910373e1f63f6d3a
parentKVM: s390: return -EFAULT if lowcore is not mapped during irq delivery (diff)
downloadkernel-qcow2-linux-331cbc277ec4ae5827b9ca538d9b5469fdca0947.tar.gz
kernel-qcow2-linux-331cbc277ec4ae5827b9ca538d9b5469fdca0947.tar.xz
kernel-qcow2-linux-331cbc277ec4ae5827b9ca538d9b5469fdca0947.zip
KVM: s390: don't use kvm lock in interrupt injection code
The kvm lock protects us against vcpus going away, but they only go away when the virtual machine is shut down. We don't need this mutex here, so let's get rid of it. Signed-off-by: Jens Freimann <jfrei@linux.vnet.ibm.com> Reviewed-by: David Hildenbrand <dahi@linux.vnet.ibm.com> Reviewed-by: Cornelia Huck <cornelia.huck@de.ibm.com> Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
-rw-r--r--arch/s390/kvm/interrupt.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/s390/kvm/interrupt.c b/arch/s390/kvm/interrupt.c
index e2f624058457..ba89bbbd2ed5 100644
--- a/arch/s390/kvm/interrupt.c
+++ b/arch/s390/kvm/interrupt.c
@@ -991,7 +991,6 @@ int kvm_s390_inject_vcpu(struct kvm_vcpu *vcpu,
trace_kvm_s390_inject_vcpu(vcpu->vcpu_id, s390int->type, s390int->parm,
s390int->parm64, 2);
- mutex_lock(&vcpu->kvm->lock);
li = &vcpu->arch.local_int;
spin_lock(&li->lock);
if (inti->type == KVM_S390_PROGRAM_INT)
@@ -1003,7 +1002,6 @@ int kvm_s390_inject_vcpu(struct kvm_vcpu *vcpu,
li->action_bits |= ACTION_STOP_ON_STOP;
atomic_set_mask(CPUSTAT_EXT_INT, li->cpuflags);
spin_unlock(&li->lock);
- mutex_unlock(&vcpu->kvm->lock);
kvm_s390_vcpu_wakeup(vcpu);
return 0;
}