The patch titled nodemask: fix the declaration of NODEMASK_ALLOC() has been added to the -mm tree. Its filename is nodemask-fix-the-declaration-of-nodemask_alloc.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: nodemask: fix the declaration of NODEMASK_ALLOC() From: Miao Xie <miaox@xxxxxxxxxxxxxx> we can't declarate two variable at the same scope by NODEMASK_ALLOC(). This patch fixes it. Signed-off-by: Miao Xie <miaox@xxxxxxxxxxxxxx> Cc: David Rientjes <rientjes@xxxxxxxxxx> Cc: Lee Schermerhorn <lee.schermerhorn@xxxxxx> Cc: Nick Piggin <npiggin@xxxxxxx> Cc: Paul Menage <menage@xxxxxxxxxx> Cc: Ingo Molnar <mingo@xxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- include/linux/nodemask.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -puN include/linux/nodemask.h~nodemask-fix-the-declaration-of-nodemask_alloc include/linux/nodemask.h --- a/include/linux/nodemask.h~nodemask-fix-the-declaration-of-nodemask_alloc +++ a/include/linux/nodemask.h @@ -483,7 +483,7 @@ static inline int num_node_state(enum no type *name = kmalloc(sizeof(*name), gfp_flags) #define NODEMASK_FREE(m) kfree(m) #else -#define NODEMASK_ALLOC(type, name, gfp_flags) type _name, *name = &_name +#define NODEMASK_ALLOC(type, name, gfp_flags) type _##name, *name = &_##name #define NODEMASK_FREE(m) do {} while (0) #endif _ Patches currently in -mm which might be from miaox@xxxxxxxxxxxxxx are cpuset-fix-the-problem-that-cpuset_mem_spread_node-returns-an-offline-node.patch nodemask-fix-the-declaration-of-nodemask_alloc.patch cpuset-alloc-nodemask_t-at-heap-not-stack.patch cpusetmm-use-rwlock-to-protect-task-mempolicy-and-mems_allowed.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html