summaryrefslogtreecommitdiffstats
path: root/mm/slab.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-03-04 18:49:19 +0100
committerIngo Molnar <mingo@elte.hu>2009-03-04 18:49:19 +0100
commit28b1bd1cbc33cae95a309691d814399a69cf3070 (patch)
tree6474d10332662f5302be0df8527c9e9e31e32a95 /mm/slab.c
parent2602c3ba4508f528db024c1d209256513ea05de6 (diff)
parent1075414b06109a99b0e87601e84c74a95bd45681 (diff)
downloadlinux-28b1bd1cbc33cae95a309691d814399a69cf3070.tar.gz
linux-28b1bd1cbc33cae95a309691d814399a69cf3070.tar.bz2
linux-28b1bd1cbc33cae95a309691d814399a69cf3070.zip
Merge branch 'core/locking' into tracing/ftrace
Diffstat (limited to 'mm/slab.c')
-rw-r--r--mm/slab.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/mm/slab.c b/mm/slab.c
index aeeb4ecb9428..9ec66c3e6ee0 100644
--- a/mm/slab.c
+++ b/mm/slab.c
@@ -3327,6 +3327,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;
@@ -3403,6 +3405,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;