Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 78b656b8 authored by Keith Mannthey's avatar Keith Mannthey Committed by Linus Torvalds
Browse files

[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: default avatarKeith Mannthey <kmannth@us.ibm.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 708e1689

arch/i386/kernel/smpboot.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

include/asm-i386/mach-summit/mach_apic.h

+1 −1
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ static inline void clustered_apic_check(void) 


static inline int apicid_to_node(int logical_apicid)

{

	return apicid_2_node[logical_apicid];

	return apicid_2_node[hard_smp_processor_id()];

}



/* Mapping from cpu number to logical apicid */