[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>

authored by Keith Mannthey and committed by Linus Torvalds 78b656b8 708e1689

+2 -2
+1 -1
arch/i386/kernel/smpboot.c
··· 648 648 { 649 649 int cpu = smp_processor_id(); 650 650 int apicid = logical_smp_processor_id(); 651 - int node = apicid_to_node(hard_smp_processor_id()); 651 + int node = apicid_to_node(apicid); 652 652 653 653 if (!node_online(node)) 654 654 node = first_online_node;
+1 -1
include/asm-i386/mach-summit/mach_apic.h
··· 88 88 89 89 static 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 94 /* Mapping from cpu number to logical apicid */