From e70f024e958ac0f1ba973333cbfd0488221e8d1d Mon Sep 17 00:00:00 2001
From: Chris Lalancette <clalance@redhat.com>
Date: Wed, 16 Jun 2010 17:11:12 -0400
Subject: [PATCH] --- yaml --- r: 202349 b: refs/heads/master c:
 e7dca5c0eba63e4ba8e3586c4b37863fd7fadb5a h: refs/heads/master i:   202347:
 31fd517faf0b49e3a0b606ba4bed3fa6d3615d51 v: v3

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

diff --git a/[refs] b/[refs]
index f48f526b1971..c58acc74d80a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 33572ac0ad5ba5016da72e6654e607726568f9c0
+refs/heads/master: e7dca5c0eba63e4ba8e3586c4b37863fd7fadb5a
diff --git a/trunk/arch/x86/kvm/lapic.c b/trunk/arch/x86/kvm/lapic.c
index 024f6d1c2996..49573c78c24b 100644
--- a/trunk/arch/x86/kvm/lapic.c
+++ b/trunk/arch/x86/kvm/lapic.c
@@ -1107,13 +1107,11 @@ int kvm_apic_accept_pic_intr(struct kvm_vcpu *vcpu)
 	u32 lvt0 = apic_get_reg(vcpu->arch.apic, APIC_LVT0);
 	int r = 0;
 
-	if (kvm_vcpu_is_bsp(vcpu)) {
-		if (!apic_hw_enabled(vcpu->arch.apic))
-			r = 1;
-		if ((lvt0 & APIC_LVT_MASKED) == 0 &&
-		    GET_APIC_DELIVERY_MODE(lvt0) == APIC_MODE_EXTINT)
-			r = 1;
-	}
+	if (!apic_hw_enabled(vcpu->arch.apic))
+		r = 1;
+	if ((lvt0 & APIC_LVT_MASKED) == 0 &&
+	    GET_APIC_DELIVERY_MODE(lvt0) == APIC_MODE_EXTINT)
+		r = 1;
 	return r;
 }