Commit 8f211b6c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm 

Pull KVM fix from Paolo Bonzini:
 "Fix for a brown paper bag bug.  Thanks to Drew Jones for noticing"

* tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
  kvm: x86: fix apic_base enable check
parents 8b6d79f5 0dce7cd6

arch/x86/kvm/lapic.c

+1 −1
Original line number Diff line number Diff line
@@ -1355,7 +1355,7 @@ void kvm_lapic_set_base(struct kvm_vcpu *vcpu, u64 value) 
	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