sched/numa: Fix the new NUMA topology bits

There's no need to convert a node number to a node number by
pretending its a cpu number..

Reported-by: Yinghai Lu <[email protected]>
Reported-and-Tested-by: Greg Pearson <[email protected]>
Signed-off-by: Peter Zijlstra <[email protected]>
Link: http://lkml.kernel.org/n/[email protected]
Signed-off-by: Ingo Molnar <[email protected]>

diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index b4f2096980a39d0f2d0ef8e8d7237ceabffa8065..0738036fa569b576eb6dcaa4cf401f2252d2ac36 100644 (file)
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -6395,8 +6395,7 @@ static void sched_init_numa(void)
                        sched_domains_numa_masks[i][j] = mask;
 
                        for (k = 0; k < nr_node_ids; k++) {
-                               if (node_distance(cpu_to_node(j), k) >
-                                               sched_domains_numa_distance[i])
+                               if (node_distance(j, k) > sched_domains_numa_distance[i])
                                        continue;
 
                                cpumask_or(mask, mask, cpumask_of_node(k));