diff options
author | Radim Krčmář <rkrcmar@redhat.com> | 2016-03-02 22:56:39 +0100 |
---|---|---|
committer | Paolo Bonzini <pbonzini@redhat.com> | 2016-03-04 09:29:37 +0100 |
commit | f6e0a0c113f78a0e13c69762b2ab342d6c69220d (patch) | |
tree | cb3958c9a71c8bbbfcf6509e5fc08e332254eeca /arch/x86/kvm/i8254.c | |
parent | 7dd0fdff145c5be7146d0ac06732ae3613412ac1 (diff) | |
download | linux-stable-f6e0a0c113f78a0e13c69762b2ab342d6c69220d.tar.gz linux-stable-f6e0a0c113f78a0e13c69762b2ab342d6c69220d.tar.bz2 linux-stable-f6e0a0c113f78a0e13c69762b2ab342d6c69220d.zip |
KVM: i8254: simplify atomics in kvm_pit_ack_irq
We already have a helper that does the same thing.
Signed-off-by: Radim Krčmář <rkrcmar@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'arch/x86/kvm/i8254.c')
-rw-r--r-- | arch/x86/kvm/i8254.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/arch/x86/kvm/i8254.c b/arch/x86/kvm/i8254.c index ab5318727579..7d694ac7f4a4 100644 --- a/arch/x86/kvm/i8254.c +++ b/arch/x86/kvm/i8254.c @@ -236,19 +236,9 @@ static void kvm_pit_ack_irq(struct kvm_irq_ack_notifier *kian) { struct kvm_kpit_state *ps = container_of(kian, struct kvm_kpit_state, irq_ack_notifier); - int value; spin_lock(&ps->inject_lock); - value = atomic_dec_return(&ps->pending); - if (value < 0) - /* spurious acks can be generated if, for example, the - * PIC is being reset. Handle it gracefully here - */ - atomic_inc(&ps->pending); - else if (value > 0 && ps->reinject) - /* in this case, we had multiple outstanding pit interrupts - * that we needed to inject. Reinject - */ + if (atomic_dec_if_positive(&ps->pending) > 0 && ps->reinject) queue_kthread_work(&ps->pit->worker, &ps->pit->expired); ps->irq_ack = 1; spin_unlock(&ps->inject_lock); |