From dcb67846080f31106b02650e5e2a8e45b0936d9b Mon Sep 17 00:00:00 2001 From: Vivek Goyal Date: Wed, 11 Jan 2006 22:45:09 +0100 Subject: [PATCH] --- yaml --- r: 17981 b: refs/heads/master c: b9d1e4bd6e44f2a75340226eb5f762e16bb4652f h: refs/heads/master i: 17979: feb353210af55f17587f56b8de7c69e87b89a3a7 v: v3 --- [refs] | 2 +- trunk/arch/x86_64/kernel/apic.c | 2 +- trunk/include/asm-x86_64/apicdef.h | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 3c8cddc47ced..f1d774b43b3e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: aea9fca1dc8a1f9ac5d3b76ef04516a010cbf2e4 +refs/heads/master: b9d1e4bd6e44f2a75340226eb5f762e16bb4652f diff --git a/trunk/arch/x86_64/kernel/apic.c b/trunk/arch/x86_64/kernel/apic.c index 628aebf9f9aa..c3239f6c22be 100644 --- a/trunk/arch/x86_64/kernel/apic.c +++ b/trunk/arch/x86_64/kernel/apic.c @@ -1066,7 +1066,7 @@ int __init APIC_init_uniprocessor (void) connect_bsp_APIC(); phys_cpu_present_map = physid_mask_of_physid(boot_cpu_id); - apic_write_around(APIC_ID, boot_cpu_id); + apic_write_around(APIC_ID, SET_APIC_ID(boot_cpu_id)); setup_local_APIC(); diff --git a/trunk/include/asm-x86_64/apicdef.h b/trunk/include/asm-x86_64/apicdef.h index fb1c99ac669f..decaa2d540e8 100644 --- a/trunk/include/asm-x86_64/apicdef.h +++ b/trunk/include/asm-x86_64/apicdef.h @@ -13,6 +13,7 @@ #define APIC_ID 0x20 #define APIC_ID_MASK (0xFFu<<24) #define GET_APIC_ID(x) (((x)>>24)&0xFFu) +#define SET_APIC_ID(x) (((x)<<24)) #define APIC_LVR 0x30 #define APIC_LVR_MASK 0xFF00FF #define GET_APIC_VERSION(x) ((x)&0xFFu)