diff options
| author | Thomas Gleixner | 2010-02-17 15:00:41 +0100 |
|---|---|---|
| committer | Marcelo Tosatti | 2010-03-01 16:36:12 +0100 |
| commit | fa8273e9549b3cee2947d1aebe5242e7a25eb3de (patch) | |
| tree | 4a9c8b38fe5a4a1a8d366f898afd47512dee1f36 /arch/x86/kvm/x86.c | |
| parent | KVM: x86 emulator: disallow opcode 82 in 64-bit mode (diff) | |
| download | kernel-qcow2-linux-fa8273e9549b3cee2947d1aebe5242e7a25eb3de.tar.gz kernel-qcow2-linux-fa8273e9549b3cee2947d1aebe5242e7a25eb3de.tar.xz kernel-qcow2-linux-fa8273e9549b3cee2947d1aebe5242e7a25eb3de.zip | |
KVM: Convert i8254/i8259 locks to raw_spinlocks
The i8254/i8259 locks need to be real spinlocks on preempt-rt. Convert
them to raw_spinlock. No change for !RT kernels.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Avi Kivity <avi@redhat.com>
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) r = 0; switch (chip->chip_id) { case KVM_IRQCHIP_PIC_MASTER: - spin_lock(&pic_irqchip(kvm)->lock); + raw_spin_lock(&pic_irqchip(kvm)->lock); memcpy(&pic_irqchip(kvm)->pics[0], &chip->chip.pic, sizeof(struct kvm_pic_state)); - spin_unlock(&pic_irqchip(kvm)->lock); + raw_spin_unlock(&pic_irqchip(kvm)->lock); break; case KVM_IRQCHIP_PIC_SLAVE: - spin_lock(&pic_irqchip(kvm)->lock); + raw_spin_lock(&pic_irqchip(kvm)->lock); memcpy(&pic_irqchip(kvm)->pics[1], &chip->chip.pic, sizeof(struct kvm_pic_state)); - spin_unlock(&pic_irqchip(kvm)->lock); + raw_spin_unlock(&pic_irqchip(kvm)->lock); break; case KVM_IRQCHIP_IOAPIC: r = kvm_set_ioapic(kvm, &chip->chip.ioapic); |