1 files changed, 5 insertions, 5 deletions

diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c
index dec48bfaddb8..775702f649ca 100644
--- a/arch/x86/kvm/lapic.c
+++ b/arch/x86/kvm/lapic.c
@@ -1350,8 +1350,12 @@ void kvm_lapic_set_base(struct kvm_vcpu *vcpu, u64 value)
                 return;
         }
 
+        if (!kvm_vcpu_is_bsp(apic->vcpu))
+                value &= ~MSR_IA32_APICBASE_BSP;
+        vcpu->arch.apic_base = value;
+
         /* update jump label if enable bit changes */
-        if ((vcpu->arch.apic_base ^ value) & MSR_IA32_APICBASE_ENABLE) {
+        if ((old_value ^ value) & MSR_IA32_APICBASE_ENABLE) {
                 if (value & MSR_IA32_APICBASE_ENABLE)
                         static_key_slow_dec_deferred(&apic_hw_disabled);
                 else
@@ -1359,10 +1363,6 @@ void kvm_lapic_set_base(struct kvm_vcpu *vcpu, u64 value)
                 recalculate_apic_map(vcpu->kvm);
         }
 
-        if (!kvm_vcpu_is_bsp(apic->vcpu))
-                value &= ~MSR_IA32_APICBASE_BSP;
-
-        vcpu->arch.apic_base = value;
         if ((old_value ^ value) & X2APIC_ENABLE) {
                 if (value & X2APIC_ENABLE) {
                         u32 id = kvm_apic_id(apic);