Merge branch 'core/locking' into tracing/ftrace

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;