diff options
Diffstat (limited to 'arch/x86/kvm/x86.c')
-rw-r--r-- | arch/x86/kvm/x86.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 86b739f8f173..f6ae4875d9d0 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c | |||
@@ -2542,18 +2542,18 @@ static int kvm_vm_ioctl_set_irqchip(struct kvm *kvm, struct kvm_irqchip *chip) | |||
2542 | r = 0; | 2542 | r = 0; |
2543 | switch (chip->chip_id) { | 2543 | switch (chip->chip_id) { |
2544 | case KVM_IRQCHIP_PIC_MASTER: | 2544 | case KVM_IRQCHIP_PIC_MASTER: |
2545 | spin_lock(&pic_irqchip(kvm)->lock); | 2545 | raw_spin_lock(&pic_irqchip(kvm)->lock); |
2546 | memcpy(&pic_irqchip(kvm)->pics[0], | 2546 | memcpy(&pic_irqchip(kvm)->pics[0], |
2547 | &chip->chip.pic, | 2547 | &chip->chip.pic, |
2548 | sizeof(struct kvm_pic_state)); | 2548 | sizeof(struct kvm_pic_state)); |
2549 | spin_unlock(&pic_irqchip(kvm)->lock); | 2549 | raw_spin_unlock(&pic_irqchip(kvm)->lock); |
2550 | break; | 2550 | break; |
2551 | case KVM_IRQCHIP_PIC_SLAVE: | 2551 | case KVM_IRQCHIP_PIC_SLAVE: |
2552 | spin_lock(&pic_irqchip(kvm)->lock); | 2552 | raw_spin_lock(&pic_irqchip(kvm)->lock); |
2553 | memcpy(&pic_irqchip(kvm)->pics[1], | 2553 | memcpy(&pic_irqchip(kvm)->pics[1], |
2554 | &chip->chip.pic, | 2554 | &chip->chip.pic, |
2555 | sizeof(struct kvm_pic_state)); | 2555 | sizeof(struct kvm_pic_state)); |
2556 | spin_unlock(&pic_irqchip(kvm)->lock); | 2556 | raw_spin_unlock(&pic_irqchip(kvm)->lock); |
2557 | break; | 2557 | break; |
2558 | case KVM_IRQCHIP_IOAPIC: | 2558 | case KVM_IRQCHIP_IOAPIC: |
2559 | r = kvm_set_ioapic(kvm, &chip->chip.ioapic); | 2559 | r = kvm_set_ioapic(kvm, &chip->chip.ioapic); |