Merge branch 'linus' into sched/core

[mv-sheeva.git] / include / linux / nodemask.h

diff --git a/include/linux/nodemask.h b/include/linux/nodemask.h
index c4fa64b585ffa8469ff18a993f37a4edf1faa45a..dba35e413371e599045d41134003a1ef8713fd38 100644 (file)
--- a/include/linux/nodemask.h
+++ b/include/linux/nodemask.h
@@ -483,7 +483,7 @@ static inline int num_node_state(enum node_states state)
                        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