diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-04 12:49:19 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-04 12:49:19 -0500 |
| commit | 28b1bd1cbc33cae95a309691d814399a69cf3070 (patch) | |
| tree | 6474d10332662f5302be0df8527c9e9e31e32a95 /mm/slub.c | |
| parent | 2602c3ba4508f528db024c1d209256513ea05de6 (diff) | |
| parent | 1075414b06109a99b0e87601e84c74a95bd45681 (diff) | |
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, | |||
| 1597 | unsigned long flags; | 1597 | unsigned long flags; |
| 1598 | unsigned int objsize; | 1598 | unsigned int objsize; |
| 1599 | 1599 | ||
| 1600 | lockdep_trace_alloc(gfpflags); | ||
| 1600 | might_sleep_if(gfpflags & __GFP_WAIT); | 1601 | might_sleep_if(gfpflags & __GFP_WAIT); |
| 1601 | 1602 | ||
| 1602 | if (should_failslab(s->objsize, gfpflags)) | 1603 | if (should_failslab(s->objsize, gfpflags)) |