---

yaml --- r: 334775 b: refs/heads/master c: 7f46ddb h: refs/heads/master i: 334773: f03af96 334771: 706dbe9 334767: e279110 v: v3
git-mirror · Oct 22, 2012 · b554871 · b554871
1 parent a68d17f
commit b554871
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f3ac1a4b667eeffcedf779f45529c95d66ddc71a
+refs/heads/master: 7f46ddbd487e0d0528d89534fdfb31d885977804
diff --git a/trunk/arch/x86/kvm/lapic.c b/trunk/arch/x86/kvm/lapic.c
@@ -1311,7 +1311,7 @@ void kvm_lapic_set_base(struct kvm_vcpu *vcpu, u64 value)
 	vcpu->arch.apic_base = value;
 	if (apic_x2apic_mode(apic)) {
 		u32 id = kvm_apic_id(apic);
-		u32 ldr = ((id & ~0xf) << 16) | (1 << (id & 0xf));
+		u32 ldr = ((id >> 4) << 16) | (1 << (id & 0xf));
 		kvm_apic_set_ldr(apic, ldr);
 	}
 	apic->base_address = apic->vcpu->arch.apic_base &