---

yaml --- r: 197706 b: refs/heads/master c: 041b135 h: refs/heads/master v: v3
git-mirror · May 17, 2010 · 61c0632 · 61c0632
1 parent 3984568
commit 61c0632
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: de3e6480f76804fe06d460ddb1920c7daa07f29b
+refs/heads/master: 041b1359a29b9301bc8baed6efcdbad29f80f6af
diff --git a/trunk/arch/x86/kvm/timer.c b/trunk/arch/x86/kvm/timer.c
@@ -12,7 +12,8 @@ static int __kvm_timer_fn(struct kvm_vcpu *vcpu, struct kvm_timer *ktimer)
 	/*
 	 * There is a race window between reading and incrementing, but we do
 	 * not care about potentially loosing timer events in the !reinject
-	 * case anyway.
+	 * case anyway. Note: KVM_REQ_PENDING_TIMER is implicitly checked
+	 * in vcpu_enter_guest.
 	 */
 	if (ktimer->reinject || !atomic_read(&ktimer->pending)) {
 		atomic_inc(&ktimer->pending);