diff --git a/[refs] b/[refs] index 981183de92c0..995bdfa8e4b9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a38374b8bd482b1e7c25f830772e9b73337ec2ed +refs/heads/master: 7baab93f9297da3e42a8cecfbf91d5f22f415500 diff --git a/trunk/include/linux/nodemask.h b/trunk/include/linux/nodemask.h index c4fa64b585ff..dba35e413371 100644 --- a/trunk/include/linux/nodemask.h +++ b/trunk/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