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/slub.c | |
parent | a1be621dfacbef0fd374d8acd553d71e07bf29ac (diff) | |
parent | efed792d6738964f399a508ef9e831cd60fa4657 (diff) | |
download | linux-c4ef144a9d0803eb0a2d4110ae87e7f34e667ded.tar.bz2 |
Merge branch 'tracing/ftrace' into tracing/core
Diffstat (limited to 'mm/slub.c')
-rw-r--r-- | mm/slub.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mm/slub.c b/mm/slub.c index 6de5e07c8850..816734ed8aa3 100644 --- a/mm/slub.c +++ b/mm/slub.c @@ -1597,6 +1597,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)) |