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 branch 'locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[linux-2.6-block.git]
/
mm
/
slab.c
diff --git
a/mm/slab.c
b/mm/slab.c
index 4d00855629c4921e3c590406335549683e6c6daf..825c606f691d11bfb3372627aff50f115358aff3 100644
(file)
--- a/
mm/slab.c
+++ b/
mm/slab.c
@@
-3318,6
+3318,8
@@
__cache_alloc_node(struct kmem_cache *cachep, gfp_t flags, int nodeid,
unsigned long save_flags;
void *ptr;
+ lockdep_trace_alloc(flags);
+
if (slab_should_failslab(cachep, flags))
return NULL;
@@
-3394,6
+3396,8
@@
__cache_alloc(struct kmem_cache *cachep, gfp_t flags, void *caller)
unsigned long save_flags;
void *objp;
+ lockdep_trace_alloc(flags);
+
if (slab_should_failslab(cachep, flags))
return NULL;