diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-05 10:20:47 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-05 10:20:47 +0100 |
| commit | c4ef144a9d0803eb0a2d4110ae87e7f34e667ded (patch) | |
| tree | b4b5e472bafb3d5d0d8ea26680e1d8cc87365c30 /mm/slab.c | |
| parent | a1be621dfacbef0fd374d8acd553d71e07bf29ac (diff) | |
| parent | efed792d6738964f399a508ef9e831cd60fa4657 (diff) | |
Merge branch 'tracing/ftrace' into tracing/core
Diffstat (limited to 'mm/slab.c')
| -rw-r--r-- | mm/slab.c | 4 |
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; |