aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/x86/kvm/timer.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kvm/timer.c b/arch/x86/kvm/timer.c
index 1baed414b57a..eea40439066c 100644
--- a/arch/x86/kvm/timer.c
+++ b/arch/x86/kvm/timer.c
@@ -15,9 +15,9 @@ static int __kvm_timer_fn(struct kvm_vcpu *vcpu, struct kvm_timer *ktimer)
15 * case anyway. 15 * case anyway.
16 */ 16 */
17 if (ktimer->reinject || !atomic_read(&ktimer->pending)) { 17 if (ktimer->reinject || !atomic_read(&ktimer->pending)) {
18 atomic_inc(&ktimer->pending);
18 /* FIXME: this code should not know anything about vcpus */ 19 /* FIXME: this code should not know anything about vcpus */
19 if (!atomic_inc_and_test(&ktimer->pending)) 20 set_bit(KVM_REQ_PENDING_TIMER, &vcpu->requests);
20 set_bit(KVM_REQ_PENDING_TIMER, &vcpu->requests);
21 } 21 }
22 22
23 if (waitqueue_active(q)) 23 if (waitqueue_active(q))