Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid

[deliverable/linux.git] / arch / x86 / kvm / irq_comm.c

diff --git a/arch/x86/kvm/irq_comm.c b/arch/x86/kvm/irq_comm.c
index 54ead79e444b55e80a28d1dd201f1ee2ddf11a18..dfb4c64768771f8fa21f622eb6046e27e1ab3ed6 100644 (file)
--- a/arch/x86/kvm/irq_comm.c
+++ b/arch/x86/kvm/irq_comm.c
@@ -382,9 +382,6 @@ void kvm_scan_ioapic_routes(struct kvm_vcpu *vcpu,
        u32 i, nr_ioapic_pins;
        int idx;
 
-       /* kvm->irq_routing must be read after clearing
-        * KVM_SCAN_IOAPIC. */
-       smp_mb();
        idx = srcu_read_lock(&kvm->irq_srcu);
        table = srcu_dereference(kvm->irq_routing, &kvm->irq_srcu);
        nr_ioapic_pins = min_t(u32, table->nr_rt_entries,