1 files changed, 5 insertions, 8 deletions

diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c
index 0aa158657f20..e904ff06a83d 100644
--- a/arch/x86/kvm/lapic.c
+++ b/arch/x86/kvm/lapic.c
@@ -216,6 +216,9 @@ static void recalculate_apic_map(struct kvm *kvm)
                 if (!apic_x2apic_mode(apic) && !new->phys_map[xapic_id])
                         new->phys_map[xapic_id] = apic;
 
+                if (!kvm_apic_sw_enabled(apic))
+                        continue;
+
                 ldr = kvm_lapic_get_reg(apic, APIC_LDR);
 
                 if (apic_x2apic_mode(apic)) {
@@ -258,6 +261,8 @@ static inline void apic_set_spiv(struct kvm_lapic *apic, u32 val)
                         static_key_slow_dec_deferred(&apic_sw_disabled);
                 else
                         static_key_slow_inc(&apic_sw_disabled.key);
+
+                recalculate_apic_map(apic->vcpu->kvm);
         }
 }
 
@@ -1548,7 +1553,6 @@ static void kvm_apic_inject_pending_timer_irqs(struct kvm_lapic *apic)
 static void apic_timer_expired(struct kvm_lapic *apic)
 {
         struct kvm_vcpu *vcpu = apic->vcpu;
-        struct swait_queue_head *q = &vcpu->wq;
         struct kvm_timer *ktimer = &apic->lapic_timer;
 
         if (atomic_read(&apic->lapic_timer.pending))
@@ -1566,13 +1570,6 @@ static void apic_timer_expired(struct kvm_lapic *apic)
 
         atomic_inc(&apic->lapic_timer.pending);
         kvm_set_pending_timer(vcpu);
-
-        /*
-         * For x86, the atomic_inc() is serialized, thus
-         * using swait_active() is safe.
-         */
-        if (swait_active(q))
-                swake_up_one(q);
 }
 
 static void start_sw_tscdeadline(struct kvm_lapic *apic)