aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJens Freimann <jfrei@linux.vnet.ibm.com>2014-08-11 09:39:43 -0400
committerChristian Borntraeger <borntraeger@de.ibm.com>2014-08-25 08:35:56 -0400
commit331cbc277ec4ae5827b9ca538d9b5469fdca0947 (patch)
tree21007a8c70159b2f76428251910373e1f63f6d3a
parent7939503147f89f0799ddc89afec2aeae57dd7e2c (diff)
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,
991 trace_kvm_s390_inject_vcpu(vcpu->vcpu_id, s390int->type, s390int->parm, 991 trace_kvm_s390_inject_vcpu(vcpu->vcpu_id, s390int->type, s390int->parm,
992 s390int->parm64, 2); 992 s390int->parm64, 2);
993 993
994 mutex_lock(&vcpu->kvm->lock);
995 li = &vcpu->arch.local_int; 994 li = &vcpu->arch.local_int;
996 spin_lock(&li->lock); 995 spin_lock(&li->lock);
997 if (inti->type == KVM_S390_PROGRAM_INT) 996 if (inti->type == KVM_S390_PROGRAM_INT)
@@ -1003,7 +1002,6 @@ int kvm_s390_inject_vcpu(struct kvm_vcpu *vcpu,
1003 li->action_bits |= ACTION_STOP_ON_STOP; 1002 li->action_bits |= ACTION_STOP_ON_STOP;
1004 atomic_set_mask(CPUSTAT_EXT_INT, li->cpuflags); 1003 atomic_set_mask(CPUSTAT_EXT_INT, li->cpuflags);
1005 spin_unlock(&li->lock); 1004 spin_unlock(&li->lock);
1006 mutex_unlock(&vcpu->kvm->lock);
1007 kvm_s390_vcpu_wakeup(vcpu); 1005 kvm_s390_vcpu_wakeup(vcpu);
1008 return 0; 1006 return 0;
1009} 1007}