diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-30 17:17:35 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-30 17:17:35 -0700 |
| commit | c4e1aa67ed9e4e542a064bc271ddbf152b677e91 (patch) | |
| tree | 2a2ca00bed0fc22b4eb83db092c9178868d8f76b /mm/slub.c | |
| parent | cf2f7d7c90279cdbc12429de278f3d27ac2050ae (diff) | |
| parent | 2f8501815256af8498904e68bd0984b1afffd6f8 (diff) | |
| download | linux-c4e1aa67ed9e4e542a064bc271ddbf152b677e91.tar.bz2 | |
Merge branch 'locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (33 commits)
lockdep: fix deadlock in lockdep_trace_alloc
lockdep: annotate reclaim context (__GFP_NOFS), fix SLOB
lockdep: annotate reclaim context (__GFP_NOFS), fix
lockdep: build fix for !PROVE_LOCKING
lockstat: warn about disabled lock debugging
lockdep: use stringify.h
lockdep: simplify check_prev_add_irq()
lockdep: get_user_chars() redo
lockdep: simplify get_user_chars()
lockdep: add comments to mark_lock_irq()
lockdep: remove macro usage from mark_held_locks()
lockdep: fully reduce mark_lock_irq()
lockdep: merge the !_READ mark_lock_irq() helpers
lockdep: merge the _READ mark_lock_irq() helpers
lockdep: simplify mark_lock_irq() helpers #3
lockdep: further simplify mark_lock_irq() helpers
lockdep: simplify the mark_lock_irq() helpers
lockdep: split up mark_lock_irq()
lockdep: generate usage strings
lockdep: generate the state bit definitions
...
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 c65a4edafc33..c4ea9158c9fb 100644 --- a/mm/slub.c +++ b/mm/slub.c @@ -1590,6 +1590,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)) |