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
/
slub.c
diff --git
a/mm/slub.c
b/mm/slub.c
index c65a4edafc3343e83a2513f8edab9b0ed82f3ab5..c4ea9158c9fbd0e4630062aa0098406000be45c3 100644
(file)
--- a/
mm/slub.c
+++ b/
mm/slub.c
@@
-1590,6
+1590,7
@@
static __always_inline void *slab_alloc(struct kmem_cache *s,
unsigned long flags;
unsigned int objsize;
+ lockdep_trace_alloc(gfpflags);
might_sleep_if(gfpflags & __GFP_WAIT);
if (should_failslab(s->objsize, gfpflags))