commit 49f520b99af13d8cafec6f227dabf6acf236c887
author David Hildenbrand <david@redhat.com> Fri Apr 07 10:50:29 2017 +0200
committer Radim Krčmář <rkrcmar@redhat.com> Wed Apr 12 20:17:14 2017 +0200
tree 77f3f236c2515ba918acca6001f30e6f64366fc6
parent ba7454e17f90a7dfecc3eb82ec19eb7ac5b6f0e0

KVM: x86: push usage of slots_lock down

Let's just move it to the place where it is actually needed.

Signed-off-by: David Hildenbrand <david@redhat.com>
Signed-off-by: Radim Krčmář <rkrcmar@redhat.com>

arch/x86/kvm/ioapic.c

diff --git a/arch/x86/kvm/ioapic.c b/arch/x86/kvm/ioapic.c
index 10941a6..6e1d8cb 100644
--- a/arch/x86/kvm/ioapic.c
+++ b/arch/x86/kvm/ioapic.c
@@ -637,7 +637,9 @@ void kvm_ioapic_destroy(struct kvm *kvm)
 		return;
 
 	cancel_delayed_work_sync(&ioapic->eoi_inject);
+	mutex_lock(&kvm->slots_lock);
 	kvm_io_bus_unregister_dev(kvm, KVM_MMIO_BUS, &ioapic->dev);
+	mutex_unlock(&kvm->slots_lock);
 	kvm->arch.vioapic = NULL;
 	kfree(ioapic);
 }