From a811aaecf206ff0fcd680c3f37aca61487191a0d Mon Sep 17 00:00:00 2001
From: Marcelo Tosatti <mtosatti@redhat.com>
Date: Wed, 14 May 2008 02:29:06 -0300
Subject: [PATCH] --- yaml --- r: 96923 b: refs/heads/master c:
 54aaacee35afd594bba3244c20b02cc98d80a961 h: refs/heads/master i:   96921:
 04c5d0d8b5c842e3a13f7f5f6a764e121269d135   96919:
 3ec9341d4c43b1fd8032f7e0180a10c401bc89e5 v: v3

---
 [refs]                     | 2 +-
 trunk/arch/x86/kvm/lapic.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 71fd65dd2e36..fffd593373c2 100644
--- 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
index 36809d79788b..c297c50eba63 100644
--- 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;