diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-06-12 11:46:58 +0800 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-06-12 11:46:58 +0800 |
| commit | 66e61060d7ad9fcf61475fb836fb5987db7a7ee0 (patch) | |
| tree | a0abe3fb2fa8858261dc41df9444c0e0ca85f1a6 /virt | |
| parent | a89c3e956ae78cec8926b92f2d61b7a5b675e787 (diff) | |
| parent | f242e50eee1ec7692c4854d94e8cd543991cce71 (diff) | |
Merge branch 'asoc-ab8500' into for-3.6
Diffstat (limited to 'virt')
| -rw-r--r-- | virt/kvm/irq_comm.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/virt/kvm/irq_comm.c b/virt/kvm/irq_comm.c index a6a0365475e..5afb4311402 100644 --- a/virt/kvm/irq_comm.c +++ b/virt/kvm/irq_comm.c @@ -332,6 +332,7 @@ static int setup_routing_entry(struct kvm_irq_routing_table *rt, */ hlist_for_each_entry(ei, n, &rt->map[ue->gsi], link) if (ei->type == KVM_IRQ_ROUTING_MSI || + ue->type == KVM_IRQ_ROUTING_MSI || ue->u.irqchip.irqchip == ei->irqchip.irqchip) return r; |