diff options
| author | Ingo Molnar <mingo@kernel.org> | 2012-06-11 10:51:35 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-06-11 10:51:35 +0200 |
| commit | c3e228d59bd2054fd57f7f146ef0f6fb0e1996b7 (patch) | |
| tree | 1817910408fa7b5027e463725a6eb54933c71928 /virt/kvm | |
| parent | 7eb9ba5ed312ec6ed9d22259c5da1acb7cf4bd29 (diff) | |
| parent | cfaf025112d3856637ff34a767ef785ef5cf2ca9 (diff) | |
Merge tag 'v3.5-rc2' into perf/core
Merge in Linux 3.5-rc2 - to pick up fixes.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'virt/kvm')
| -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; |