diff --git a/[refs] b/[refs] index 7395efd250a3..64569f9ffa38 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cb83b629bae0327cf9f44f096adc38d150ceb913 +refs/heads/master: dd7d8634e619b715a537402672d1383535ff4c54 diff --git a/trunk/kernel/sched/core.c b/trunk/kernel/sched/core.c index b4f2096980a3..0738036fa569 100644 --- a/trunk/kernel/sched/core.c +++ b/trunk/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));