---

yaml --- r: 304999 b: refs/heads/master c: dd7d863 h: refs/heads/master i: 304997: fe14fe1 304995: 7960bc9 304991: 7b4c2e0 v: v3
git-mirror · May 14, 2012 · 2d42a2a · 2d42a2a
1 parent e1c1ca3
commit 2d42a2a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git 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
@@ -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));