On Mon, May 14, 2012 at 6:43 AM, tip-bot for Peter Zijlstra <a.p.zijlstra@xxxxxxxxx> wrote: > Commit-ID: dd7d8634e619b715a537402672d1383535ff4c54 > Gitweb: http://git.kernel.org/tip/dd7d8634e619b715a537402672d1383535ff4c54 > Author: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx> > AuthorDate: Fri, 11 May 2012 00:56:20 +0200 > Committer: Ingo Molnar <mingo@xxxxxxxxxx> > CommitDate: Mon, 14 May 2012 15:05:25 +0200 > > 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@xxxxxxxxxx> > Reported-and-Tested-by: Greg Pearson <greg.pearson@xxxxxx> > Signed-off-by: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx> > Link: http://lkml.kernel.org/n/tip-0sqhrht34phowgclj12dgk8h@xxxxxxxxxxxxxx > Signed-off-by: Ingo Molnar <mingo@xxxxxxxxxx> > --- > 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 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)); this one should be folded into offending commit Commit-ID: cb83b629bae0327cf9f44f096adc38d150ceb913 Gitweb: http://git.kernel.org/tip/cb83b629bae0327cf9f44f096adc38d150ceb913 Author: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx> AuthorDate: Tue, 17 Apr 2012 15:49:36 +0200 Committer: Ingo Molnar <mingo@xxxxxxxxxx> CommitDate: Wed, 9 May 2012 15:00:55 +0200 sched/numa: Rewrite the CONFIG_NUMA sched domain support Thanks Yinghai -- To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html