diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-03-04 18:49:19 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-03-04 18:49:19 +0100 |
commit | 28b1bd1cbc33cae95a309691d814399a69cf3070 (patch) | |
tree | 6474d10332662f5302be0df8527c9e9e31e32a95 /mm/slub.c | |
parent | 2602c3ba4508f528db024c1d209256513ea05de6 (diff) | |
parent | 1075414b06109a99b0e87601e84c74a95bd45681 (diff) | |
download | op-kernel-dev-28b1bd1cbc33cae95a309691d814399a69cf3070.zip op-kernel-dev-28b1bd1cbc33cae95a309691d814399a69cf3070.tar.gz |
Merge branch 'core/locking' into tracing/ftrace
Diffstat (limited to 'mm/slub.c')
-rw-r--r-- | mm/slub.c | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -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)) |