diff options
| author | Vivek Goyal <vgoyal@in.ibm.com> | 2006-01-11 22:45:09 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-11 19:04:57 -0800 |
| commit | b9d1e4bd6e44f2a75340226eb5f762e16bb4652f (patch) | |
| tree | e886056fb4a412e98e8f52e559c16be95994db55 | |
| parent | aea9fca1dc8a1f9ac5d3b76ef04516a010cbf2e4 (diff) | |
| download | linux-b9d1e4bd6e44f2a75340226eb5f762e16bb4652f.tar.bz2 | |
[PATCH] x86_64: x86_64 write apic id fix
o Apic id is in most significant 8 bits of APIC_ID register. Current code
is trying to write apic id to least significant 8 bits. This patch fixes
it.
o This fix enables booting uni kdump capture kernel on a cpu with non-zero
apic id.
Signed-off-by: Vivek Goyal <vgoyal@in.ibm.com>
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| -rw-r--r-- | arch/x86_64/kernel/apic.c | 2 | ||||
| -rw-r--r-- | include/asm-x86_64/apicdef.h | 1 |
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) 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/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 @@ #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) |