diff options
Diffstat (limited to 'virt/kvm/irq_comm.c')
-rw-r--r-- | virt/kvm/irq_comm.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/virt/kvm/irq_comm.c b/virt/kvm/irq_comm.c index fadf4408a820..15a83b93566d 100644 --- a/virt/kvm/irq_comm.c +++ b/virt/kvm/irq_comm.c | |||
@@ -82,8 +82,6 @@ int kvm_irq_delivery_to_apic(struct kvm *kvm, struct kvm_lapic *src, | |||
82 | int i, r = -1; | 82 | int i, r = -1; |
83 | struct kvm_vcpu *vcpu, *lowest = NULL; | 83 | struct kvm_vcpu *vcpu, *lowest = NULL; |
84 | 84 | ||
85 | WARN_ON(!mutex_is_locked(&kvm->irq_lock)); | ||
86 | |||
87 | if (irq->dest_mode == 0 && irq->dest_id == 0xff && | 85 | if (irq->dest_mode == 0 && irq->dest_id == 0xff && |
88 | kvm_is_dm_lowest_prio(irq)) | 86 | kvm_is_dm_lowest_prio(irq)) |
89 | printk(KERN_INFO "kvm: apic: phys broadcast and lowest prio\n"); | 87 | printk(KERN_INFO "kvm: apic: phys broadcast and lowest prio\n"); |
@@ -138,7 +136,7 @@ static int kvm_set_msi(struct kvm_kernel_irq_routing_entry *e, | |||
138 | return kvm_irq_delivery_to_apic(kvm, NULL, &irq); | 136 | return kvm_irq_delivery_to_apic(kvm, NULL, &irq); |
139 | } | 137 | } |
140 | 138 | ||
141 | /* This should be called with the kvm->irq_lock mutex held | 139 | /* |
142 | * Return value: | 140 | * Return value: |
143 | * < 0 Interrupt was ignored (masked or not delivered for other reasons) | 141 | * < 0 Interrupt was ignored (masked or not delivered for other reasons) |
144 | * = 0 Interrupt was coalesced (previous irq is still pending) | 142 | * = 0 Interrupt was coalesced (previous irq is still pending) |
@@ -153,8 +151,6 @@ int kvm_set_irq(struct kvm *kvm, int irq_source_id, u32 irq, int level) | |||
153 | 151 | ||
154 | trace_kvm_set_irq(irq, level, irq_source_id); | 152 | trace_kvm_set_irq(irq, level, irq_source_id); |
155 | 153 | ||
156 | WARN_ON(!mutex_is_locked(&kvm->irq_lock)); | ||
157 | |||
158 | /* Not possible to detect if the guest uses the PIC or the | 154 | /* Not possible to detect if the guest uses the PIC or the |
159 | * IOAPIC. So set the bit in both. The guest will ignore | 155 | * IOAPIC. So set the bit in both. The guest will ignore |
160 | * writes to the unused one. | 156 | * writes to the unused one. |