diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2015-12-18 19:14:46 +0100 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2015-12-18 19:14:46 +0100 |
| commit | 6fd086214a32510b963d9662b034bfd16cfad2ba (patch) | |
| tree | ea96b05c3b45295589305ad71b72dcb7e5d24082 | |
| parent | KVM: VMX: Fix host initiated access to guest MSR_TSC_AUX (diff) | |
| parent | KVM: arm/arm64: vgic: Fix kvm_vgic_map_is_active's dist check (diff) | |
| download | linux-6fd086214a32510b963d9662b034bfd16cfad2ba.tar.xz linux-6fd086214a32510b963d9662b034bfd16cfad2ba.zip | |
Merge tag 'kvm-arm-for-v4.4-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD
KVM/ARM fixes for v4.4-rc6
- Fix for the active interrupt detection code, affecting
the timer interrupt injection.
| -rw-r--r-- | virt/kvm/arm/vgic.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/virt/kvm/arm/vgic.c b/virt/kvm/arm/vgic.c index 65461f821a75..7a2f449bd85d 100644 --- a/virt/kvm/arm/vgic.c +++ b/virt/kvm/arm/vgic.c @@ -1114,7 +1114,7 @@ bool kvm_vgic_map_is_active(struct kvm_vcpu *vcpu, struct irq_phys_map *map) return true; } - return dist_active_irq(vcpu); + return vgic_irq_is_active(vcpu, map->virt_irq); } /* |