Merge tag 'kvm-arm-for-v4.4-rc6' of git://git.kernel.org/pub/scm/linu…

…x/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.
mariux64 · Dec 18, 2015 · 6fd0862 · 6fd0862
2 parents 81b1b9c + fdec12c
commit 6fd0862
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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);
 }
 
 /*