diff options
author | Peter Zijlstra <a.p.zijlstra@chello.nl> | 2012-05-10 18:56:20 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2012-05-14 09:05:25 -0400 |
commit | dd7d8634e619b715a537402672d1383535ff4c54 (patch) | |
tree | 078f8c8c7a02dbee4d569569aa4759d9fcf1201a /kernel/sched/core.c | |
parent | cb83b629bae0327cf9f44f096adc38d150ceb913 (diff) |
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 <yinghai@kernel.org>
Reported-and-Tested-by: Greg Pearson <greg.pearson@hp.com>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/n/tip-0sqhrht34phowgclj12dgk8h@git.kernel.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/sched/core.c')
-rw-r--r-- | kernel/sched/core.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/kernel/sched/core.c b/kernel/sched/core.c index b4f2096980a3..0738036fa569 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c | |||
@@ -6395,8 +6395,7 @@ static void sched_init_numa(void) | |||
6395 | sched_domains_numa_masks[i][j] = mask; | 6395 | sched_domains_numa_masks[i][j] = mask; |
6396 | 6396 | ||
6397 | for (k = 0; k < nr_node_ids; k++) { | 6397 | for (k = 0; k < nr_node_ids; k++) { |
6398 | if (node_distance(cpu_to_node(j), k) > | 6398 | if (node_distance(j, k) > sched_domains_numa_distance[i]) |
6399 | sched_domains_numa_distance[i]) | ||
6400 | continue; | 6399 | continue; |
6401 | 6400 | ||
6402 | cpumask_or(mask, mask, cpumask_of_node(k)); | 6401 | cpumask_or(mask, mask, cpumask_of_node(k)); |