projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm
[cascardo/linux.git]
/
arch
/
x86
/
kvm
/
lapic.c
diff --git
a/arch/x86/kvm/lapic.c
b/arch/x86/kvm/lapic.c
index
86609c1
..
e55b5fc
100644
(file)
--- a/
arch/x86/kvm/lapic.c
+++ b/
arch/x86/kvm/lapic.c
@@
-193,6
+193,9
@@
static void recalculate_apic_map(struct kvm *kvm)
u16 cid, lid;
u32 ldr, aid;
+ if (!kvm_apic_present(vcpu))
+ continue;
+
aid = kvm_apic_id(apic);
ldr = kvm_apic_get_reg(apic, APIC_LDR);
cid = apic_cluster_id(new, ldr);