diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2019-02-13 19:39:24 +0100 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2019-02-13 19:39:24 +0100 |
| commit | 08e16754cad2298f8cb58bd0f99e658da54c327d (patch) | |
| tree | ef4d141c82840ecdc3b234a569a4df8442b7dcea /virt/kvm/arm/vgic/vgic-v2.c | |
| parent | bc44121190aea96de171408310db3d3c87e2cc11 (diff) | |
| parent | 7d82602909ed9c73b34ad26f05d10db4850a4f8c (diff) | |
| download | linux-stable-08e16754cad2298f8cb58bd0f99e658da54c327d.tar.gz linux-stable-08e16754cad2298f8cb58bd0f99e658da54c327d.tar.bz2 linux-stable-08e16754cad2298f8cb58bd0f99e658da54c327d.zip | |
Merge tag 'kvm-arm-fixes-for-5.0' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into kvm-master
KVM/ARM fixes for 5.0:
- Fix the way we reset vcpus, plugging the race that could happen on VHE
- Fix potentially inconsistent group setting for private interrupts
- Don't generate UNDEF when LORegion feature is present
- Relax the restriction on using stage2 PUD huge mapping
- Turn some spinlocks into raw_spinlocks to help RT compliance
Diffstat (limited to 'virt/kvm/arm/vgic/vgic-v2.c')
| -rw-r--r-- | virt/kvm/arm/vgic/vgic-v2.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/virt/kvm/arm/vgic/vgic-v2.c b/virt/kvm/arm/vgic/vgic-v2.c index 69b892abd7dc..d91a8938aa7c 100644 --- a/virt/kvm/arm/vgic/vgic-v2.c +++ b/virt/kvm/arm/vgic/vgic-v2.c @@ -84,7 +84,7 @@ void vgic_v2_fold_lr_state(struct kvm_vcpu *vcpu) irq = vgic_get_irq(vcpu->kvm, vcpu, intid); - spin_lock(&irq->irq_lock); + raw_spin_lock(&irq->irq_lock); /* Always preserve the active bit */ irq->active = !!(val & GICH_LR_ACTIVE_BIT); @@ -127,7 +127,7 @@ void vgic_v2_fold_lr_state(struct kvm_vcpu *vcpu) vgic_irq_set_phys_active(irq, false); } - spin_unlock(&irq->irq_lock); + raw_spin_unlock(&irq->irq_lock); vgic_put_irq(vcpu->kvm, irq); } |