Re: mmotm 2010-04-22-16-38 uploaded

From: Lee Schermerhorn
Date: Mon Apr 26 2010 - 17:41:52 EST


On Thu, 2010-04-22 at 21:57 -0400, Valdis.Kletnieks@xxxxxx wrote:
> On Thu, 22 Apr 2010 16:38:55 PDT, akpm@xxxxxxxxxxxxxxxxxxxx said:
> > The mm-of-the-moment snapshot 2010-04-22-16-38 has been uploaded to
> >
> > http://userweb.kernel.org/~akpm/mmotm/
>
> Found this in numa-introduce-numa_mem_id-effective-local-memory-node-id.patch:
>
> +#ifndef cpu_to_mem
> +#define cpu_to_mem(cpu) (void)(cpu),0)
> +#endif
>
> The resulting paren mismatch causes an error cascade in 2 other patches:
>
> numa-in-kernel-profiling-use-cpu_to_mem-for-per-cpu-allocations.patch
>
> causes build errors:

Thanks, Valdis. I encountered this error and thought I fixed it before
submitting the series. Apparently I submitted a stale patch.

Attached patch fixes the problem.

Lee


========================================
Fix to numa-introduce-numa_mem_id-effective-local-memory-node-id.patch
in mmotm 100422-1638

Add missing parenthesis to !NUMA stub cpu_to_mem() definition

Signed-off-by: Lee Schermerhorn <lee.schermerhorn@xxxxxx>

include/asm-generic/topology.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

Index: linux-2.6.34-rc5-mmotm-100422-1638/include/asm-generic/topology.h
===================================================================
--- linux-2.6.34-rc5-mmotm-100422-1638.orig/include/asm-generic/topology.h
+++ linux-2.6.34-rc5-mmotm-100422-1638/include/asm-generic/topology.h
@@ -35,7 +35,7 @@
#define cpu_to_node(cpu) ((void)(cpu),0)
#endif
#ifndef cpu_to_mem
-#define cpu_to_mem(cpu) (void)(cpu),0)
+#define cpu_to_mem(cpu) ((void)(cpu),0)
#endif
#ifndef parent_node
#define parent_node(node) ((void)(node),0)



--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/