projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm
[cascardo/linux.git]
/
arch
/
x86
/
kvm
/
lapic.c
diff --git
a/arch/x86/kvm/lapic.c
b/arch/x86/kvm/lapic.c
index
0eee2c8
..
afc1124
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
);
}
}