summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorKeith Mannthey <kmannth@us.ibm.com>2006-10-03 18:25:52 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-10-03 18:46:10 -0700
commit78b656b8bf933101b42409b4492734b23427bfc3 (patch)
tree35b91bbaee4a3140ba9a8e2f49b1a86c22856748 /arch
parent708e16892e1646594a29eaa7ac7b209b600b9fd2 (diff)
downloadlinux-stable-78b656b8bf933101b42409b4492734b23427bfc3.tar.gz
linux-stable-78b656b8bf933101b42409b4492734b23427bfc3.tar.bz2
linux-stable-78b656b8bf933101b42409b4492734b23427bfc3.zip
[PATCH] i383 numa: fix numaq/summit apicid conflict
This allows numaq to properly align cpus to their given node during boot. Pass logical apicid to apicid_to_node and allow the summit sub-arch to use physical apicid (hard_smp_processor_id()). Tested against numaq and summit based systems with no issues. Signed-off-by: Keith Mannthey <kmannth@us.ibm.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/i386/kernel/smpboot.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/i386/kernel/smpboot.c b/arch/i386/kernel/smpboot.c
index 9d93ecf6d999..4bb8b77cd65b 100644
--- a/arch/i386/kernel/smpboot.c
+++ b/arch/i386/kernel/smpboot.c
@@ -648,7 +648,7 @@ static void map_cpu_to_logical_apicid(void)
{
int cpu = smp_processor_id();
int apicid = logical_smp_processor_id();
- int node = apicid_to_node(hard_smp_processor_id());
+ int node = apicid_to_node(apicid);
if (!node_online(node))
node = first_online_node;