aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/x86_64/kernel/apic.c2
-rw-r--r--include/asm-x86_64/apicdef.h1
2 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86_64/kernel/apic.c b/arch/x86_64/kernel/apic.c
index 628aebf9f9aa..c3239f6c22be 100644
--- a/arch/x86_64/kernel/apic.c
+++ b/arch/x86_64/kernel/apic.c
@@ -1066,7 +1066,7 @@ int __init APIC_init_uniprocessor (void)
1066 connect_bsp_APIC(); 1066 connect_bsp_APIC();
1067 1067
1068 phys_cpu_present_map = physid_mask_of_physid(boot_cpu_id); 1068 phys_cpu_present_map = physid_mask_of_physid(boot_cpu_id);
1069 apic_write_around(APIC_ID, boot_cpu_id); 1069 apic_write_around(APIC_ID, SET_APIC_ID(boot_cpu_id));
1070 1070
1071 setup_local_APIC(); 1071 setup_local_APIC();
1072 1072
diff --git a/include/asm-x86_64/apicdef.h b/include/asm-x86_64/apicdef.h
index fb1c99ac669f..decaa2d540e8 100644
--- a/include/asm-x86_64/apicdef.h
+++ b/include/asm-x86_64/apicdef.h
@@ -13,6 +13,7 @@
13#define APIC_ID 0x20 13#define APIC_ID 0x20
14#define APIC_ID_MASK (0xFFu<<24) 14#define APIC_ID_MASK (0xFFu<<24)
15#define GET_APIC_ID(x) (((x)>>24)&0xFFu) 15#define GET_APIC_ID(x) (((x)>>24)&0xFFu)
16#define SET_APIC_ID(x) (((x)<<24))
16#define APIC_LVR 0x30 17#define APIC_LVR 0x30
17#define APIC_LVR_MASK 0xFF00FF 18#define APIC_LVR_MASK 0xFF00FF
18#define GET_APIC_VERSION(x) ((x)&0xFFu) 19#define GET_APIC_VERSION(x) ((x)&0xFFu)