aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndi Kleen2005-09-12 18:49:24 +0200
committerLinus Torvalds2005-09-12 10:49:56 -0700
commit357e11d4cbbbb959a88a9bdbbf33a10f160b0823 (patch)
tree466ff21d61294a3f22614a9f28bec5aec746d2a3
parentdf0cc26b1b7f88f46307eea50a7469f0b58132d9 (diff)
[PATCH] x86-64: Don't assume APIC for boot processor has an APIC ID of zero
Originally from Stuart Hayes. When setting up the APIC for the Uniprocessor kernel don't assume the CPU has an APIC ID of zero. This fixes boot with the UP kernel on Dell PowerEdge 6800/6850 4way systems. Cc: Stuart.Hayes@dell.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.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86_64/kernel/apic.c b/arch/x86_64/kernel/apic.c
index fc84bea42fd4..12e9d6ca7222 100644
--- a/arch/x86_64/kernel/apic.c
+++ b/arch/x86_64/kernel/apic.c
@@ -1051,7 +1051,7 @@ int __init APIC_init_uniprocessor (void)
connect_bsp_APIC();
- phys_cpu_present_map = physid_mask_of_physid(0);
+ phys_cpu_present_map = physid_mask_of_physid(boot_cpu_id);
apic_write_around(APIC_ID, boot_cpu_id);
setup_local_APIC();