Merge tag 'for-v3.11' of git://git.infradead.org/battery-2.6

[~andy/linux] / arch / x86 / kvm / lapic.c

diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c
index 0eee2c8b64d1cafecdf7f587dbeef5566b4449df..afc11245827cf2f39b56d14d50dacd6ea9aeb374 100644 (file)
--- a/arch/x86/kvm/lapic.c
+++ b/arch/x86/kvm/lapic.c
@@ -1608,8 +1608,8 @@ void kvm_inject_apic_timer_irqs(struct kvm_vcpu *vcpu)
                return;
 
        if (atomic_read(&apic->lapic_timer.pending) > 0) {
-               if (kvm_apic_local_deliver(apic, APIC_LVTT))
-                       atomic_dec(&apic->lapic_timer.pending);
+               kvm_apic_local_deliver(apic, APIC_LVTT);
+               atomic_set(&apic->lapic_timer.pending, 0);
        }
 }