aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-i386
diff options
context:
space:
mode:
authorKeith Mannthey <kmannth@us.ibm.com>2006-10-03 21:25:52 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-10-03 21:46:10 -0400
commit78b656b8bf933101b42409b4492734b23427bfc3 (patch)
tree35b91bbaee4a3140ba9a8e2f49b1a86c22856748 /include/asm-i386
parent708e16892e1646594a29eaa7ac7b209b600b9fd2 (diff)
[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 'include/asm-i386')
-rw-r--r--include/asm-i386/mach-summit/mach_apic.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-i386/mach-summit/mach_apic.h b/include/asm-i386/mach-summit/mach_apic.h
index 254a0fe01c6a..ef0671e5d5c5 100644
--- a/include/asm-i386/mach-summit/mach_apic.h
+++ b/include/asm-i386/mach-summit/mach_apic.h
@@ -88,7 +88,7 @@ static inline void clustered_apic_check(void)
88 88
89static inline int apicid_to_node(int logical_apicid) 89static inline int apicid_to_node(int logical_apicid)
90{ 90{
91 return apicid_2_node[logical_apicid]; 91 return apicid_2_node[hard_smp_processor_id()];
92} 92}
93 93
94/* Mapping from cpu number to logical apicid */ 94/* Mapping from cpu number to logical apicid */