---

yaml --- r: 96923 b: refs/heads/master c: 54aaace h: refs/heads/master i: 96921: 04c5d0d 96919: 3ec9341 v: v3
git-mirror · May 18, 2008 · a811aae · a811aae
1 parent 4d5382f
commit a811aae
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1fc9d2bf75bbe5482cc503681dae0935df29b6b0
+refs/heads/master: 54aaacee35afd594bba3244c20b02cc98d80a961
diff --git a/trunk/arch/x86/kvm/lapic.c b/trunk/arch/x86/kvm/lapic.c
@@ -957,7 +957,7 @@ int apic_has_pending_timer(struct kvm_vcpu *vcpu)
 {
 	struct kvm_lapic *lapic = vcpu->arch.apic;
 
-	if (lapic)
+	if (lapic && apic_enabled(lapic) && apic_lvt_enabled(lapic, APIC_LVTT))
 		return atomic_read(&lapic->timer.pending);
 
 	return 0;