summaryrefslogtreecommitdiffstats
path: root/kernel/sched
diff options
context:
space:
mode:
authorPeter Zijlstra <a.p.zijlstra@chello.nl>2012-05-11 00:56:20 +0200
committerIngo Molnar <mingo@kernel.org>2012-05-14 15:05:25 +0200
commitdd7d8634e619b715a537402672d1383535ff4c54 (patch)
tree078f8c8c7a02dbee4d569569aa4759d9fcf1201a /kernel/sched
parentcb83b629bae0327cf9f44f096adc38d150ceb913 (diff)
downloadop-kernel-dev-dd7d8634e619b715a537402672d1383535ff4c54.zip
op-kernel-dev-dd7d8634e619b715a537402672d1383535ff4c54.tar.gz
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')
-rw-r--r--kernel/sched/core.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index b4f2096..0738036 100644
--- 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));
OpenPOWER on IntegriCloud