diff options
| author | David Hildenbrand <david@redhat.com> | 2017-04-07 10:50:29 +0200 |
|---|---|---|
| committer | Radim Krčmář <rkrcmar@redhat.com> | 2017-04-12 20:17:14 +0200 |
| commit | 49f520b99af13d8cafec6f227dabf6acf236c887 (patch) | |
| tree | 77f3f236c2515ba918acca6001f30e6f64366fc6 /arch/x86/kvm/x86.c | |
| parent | ba7454e17f90a7dfecc3eb82ec19eb7ac5b6f0e0 (diff) | |
| download | lwn-49f520b99af13d8cafec6f227dabf6acf236c887.tar.gz lwn-49f520b99af13d8cafec6f227dabf6acf236c887.zip | |
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>
Diffstat (limited to 'arch/x86/kvm/x86.c')
| -rw-r--r-- | arch/x86/kvm/x86.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 182fea214c42..3046b7f278ae 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -4015,9 +4015,7 @@ long kvm_arch_vm_ioctl(struct file *filp, r = kvm_ioapic_init(kvm); if (r) { - mutex_lock(&kvm->slots_lock); kvm_pic_destroy(kvm); - mutex_unlock(&kvm->slots_lock); goto create_irqchip_unlock; } @@ -4027,10 +4025,8 @@ long kvm_arch_vm_ioctl(struct file *filp, kvm->arch.irqchip_mode = KVM_IRQCHIP_NONE; /* Pairs with smp_rmb() when reading irqchip_mode */ smp_wmb(); - mutex_lock(&kvm->slots_lock); kvm_ioapic_destroy(kvm); kvm_pic_destroy(kvm); - mutex_unlock(&kvm->slots_lock); goto create_irqchip_unlock; } /* Write kvm->irq_routing before enabling irqchip_in_kernel. */ |