projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branches 'topic/fixes', 'topic/cleanups' and 'topic/documentation' into for...
[linux-2.6-block.git]
/
include
/
linux
/
slab.h
diff --git
a/include/linux/slab.h
b/include/linux/slab.h
index c97ed28559ec3a0ea437900a9b96722ac7597c0d..f96d13c281e81d03bf0b791ccb10b1a918e12055 100644
(file)
--- a/
include/linux/slab.h
+++ b/
include/linux/slab.h
@@
-285,7
+285,7
@@
extern void *__kmalloc_node_track_caller(size_t, gfp_t, int, unsigned long);
#define kmalloc_node_track_caller(size, flags, node) \
kmalloc_track_caller(size, flags)
-#endif /*
DEBUG_SLAB
*/
+#endif /*
CONFIG_NUMA
*/
/*
* Shortcuts