From 2d42a2aa8bdec2747c530faef1addc5ae24d75a9 Mon Sep 17 00:00:00 2001
From: Peter Zijlstra <a.p.zijlstra@chello.nl>
Date: Fri, 11 May 2012 00:56:20 +0200
Subject: [PATCH] --- yaml --- r: 304999 b: refs/heads/master c:
 dd7d8634e619b715a537402672d1383535ff4c54 h: refs/heads/master i:   304997:
 fe14fe19f803f37ff3604fd263a0c7d5313842be   304995:
 7960bc9adb55d2516d1460acb29cb7d8504698b6   304991:
 7b4c2e0d5641b967a2a27037c8fa5d8191043044 v: v3

---
 [refs]                    | 2 +-
 trunk/kernel/sched/core.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

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));