git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy...
[pandora-kernel.git]
/
include
/
linux
/
nodemask.h
diff --git
a/include/linux/nodemask.h
b/include/linux/nodemask.h
index
c4fa64b
..
dba35e4
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
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
#define NODEMASK_FREE(m) do {} while (0)
#endif