evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

x86: not set node to cpu_to_node if the node is not online

Browse source 
resolve boot problem reported by Mel Gorman:

   http://lkml.org/lkml/2008/2/13/404

init_cpu_to_node will use cpu->apic (from MADT or mptable) and
apic->node(from SRAT or AMD config space with k8_bus_64.c) to have
cpu->node mapping, and later identify_cpu will overwrite them
again...(with nearby_node...)

this patch checks if the node is online, otherwise it will not
update cpu_node map. so keep cpu_node map to online node before
identify_cpu..., to prevent possible error.

Signed-off-by: Yinghai Lu <yinghai.lu@sun.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:
Yinghai Lu 2008-02-19 15:35:54 -08:00 • committed by Ingo Molnar
parent 18a8622101
commit 7c9e92b6cd
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
arch/x86/mm/numa_64.c
View file

@ -622,13 +622,17 @@ void __init init_cpu_to_node(void)
int i; int i;
for (i = 0; i < NR_CPUS; i++) { for (i = 0; i < NR_CPUS; i++) {
int node;
u16 apicid = x86_cpu_to_apicid_init[i]; u16 apicid = x86_cpu_to_apicid_init[i];
if (apicid == BAD_APICID) if (apicid == BAD_APICID)
continue; continue;
if (apicid_to_node[apicid] == NUMA_NO_NODE) node = apicid_to_node[apicid];
if (node == NUMA_NO_NODE)
continue; continue;
numa_set_node(i, apicid_to_node[apicid]); if (!node_online(node))
continue;
numa_set_node(i, node);
} }
} }