|
@@ -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);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|