diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-17 16:40:27 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-17 16:40:27 -0800 |
| commit | 8f211b6ccc01d058fc6c6466c7815f2315130b2e (patch) | |
| tree | 053578534b4ac967b975f073a7ffa7d3daf1bd4f /arch | |
| parent | 8b6d79f5b8eccf81688115a7e724fd6e096156d5 (diff) | |
| parent | 0dce7cd67fd9055c4a2ff278f8af1431e646d346 (diff) | |
| download | linux-8f211b6ccc01d058fc6c6466c7815f2315130b2e.tar.gz linux-8f211b6ccc01d058fc6c6466c7815f2315130b2e.tar.bz2 linux-8f211b6ccc01d058fc6c6466c7815f2315130b2e.zip | |
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
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/kvm/lapic.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c index 1673940cf9c3..775702f649ca 100644 --- a/arch/x86/kvm/lapic.c +++ b/arch/x86/kvm/lapic.c @@ -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 |