Messages in this thread | | | Date | Thu, 21 Apr 2011 12:43:21 -0700 (PDT) | From | David Rientjes <> | Subject | Re: [patch 2/2] x86, numa: Fix cpu nodemasks for NUMA emulation and CONFIG_DEBUG_PER_CPU_MAPS |
| |
On Thu, 21 Apr 2011, KOSAKI Motohiro wrote:
> From aaca24826696f7911bd66380baa18cfbe4f4b18e Mon Sep 17 00:00:00 2001 > From: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com> > Date: Thu, 21 Apr 2011 14:01:42 +0900 > Subject: [PATCH] Fix > > debug_cpumask_set_cpu() has tree return statement. we have change > rest two return statement. > > Signed-off-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com> > --- > arch/x86/mm/numa.c | 4 ++-- > 1 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/arch/x86/mm/numa.c b/arch/x86/mm/numa.c > index 0471b1d6..745258d 100644 > --- a/arch/x86/mm/numa.c > +++ b/arch/x86/mm/numa.c > @@ -220,7 +220,7 @@ void debug_cpumask_set_cpu(int cpu, int node, bool enable) > > if (node == NUMA_NO_NODE) { > /* early_cpu_to_node() already emits a warning and trace */ > - return NULL; > + return; > } > mask = node_to_cpumask_map[node]; > if (!mask) { > @@ -238,7 +238,7 @@ void debug_cpumask_set_cpu(int cpu, int node, bool enable) > printk(KERN_DEBUG "%s cpu %d node %d: mask now %s\n", > enable ? "numa_add_cpu" : "numa_remove_cpu", > cpu, node, buf); > - return mask; > + return; > } > > # ifndef CONFIG_NUMA_EMU
Yes, it looks like Ingo fixed that up when it was merged in the latest git as 7a6c6547825a, thanks for pointing it out.
| |