From b554871f8f4e3c6c7eaf03fe497e9a887d291056 Mon Sep 17 00:00:00 2001 From: Gleb Natapov Date: Sun, 14 Oct 2012 13:08:58 +0200 Subject: [PATCH] --- yaml --- r: 334775 b: refs/heads/master c: 7f46ddbd487e0d0528d89534fdfb31d885977804 h: refs/heads/master i: 334773: f03af9639e5cea31c02e99be4ebdade55178d9cc 334771: 706dbe9d7ff29c0e0a635ffa4991f8e74d48aa22 334767: e279110ddd26512f48e9e116fb720dcbf3b29736 v: v3 --- [refs] | 2 +- trunk/arch/x86/kvm/lapic.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index f2e01c752558..2349a3ec5044 100644 --- 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 index c6e6b721b6ee..43e9fadca5d0 100644 --- 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 &