Commit bfa0e9a0 authored by keith mannthey's avatar keith mannthey Committed by Linus Torvalds

[PATCH] i386: fix flat mode numa on a real numa system

If there is only 1 node in the system cpus should think they are apart of
some other node.

If cases where a real numa system boots the Flat numa option make sure the
cpus don't claim to be apart on a non-existent node.
Signed-off-by: default avatarKeith Mannthey <kmannth@us.ibm.com>
Cc: Andy Whitcroft <apw@shadowen.org>
Cc: Dave Hansen <haveblue@us.ibm.com>
Cc: Andi Kleen <ak@suse.de>
Cc: <stable@kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 3212fe15
...@@ -642,9 +642,13 @@ static void map_cpu_to_logical_apicid(void) ...@@ -642,9 +642,13 @@ static void map_cpu_to_logical_apicid(void)
{ {
int cpu = smp_processor_id(); int cpu = smp_processor_id();
int apicid = logical_smp_processor_id(); int apicid = logical_smp_processor_id();
int node = apicid_to_node(apicid);
if (!node_online(node))
node = first_online_node;
cpu_2_logical_apicid[cpu] = apicid; cpu_2_logical_apicid[cpu] = apicid;
map_cpu_to_node(cpu, apicid_to_node(apicid)); map_cpu_to_node(cpu, node);
} }
static void unmap_cpu_to_logical_apicid(int cpu) static void unmap_cpu_to_logical_apicid(int cpu)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment