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/slob.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/slob.c')
| -rw-r--r-- | mm/slob.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mm/slob.c b/mm/slob.c index 0bfa680a8981..7a3411524dac 100644 --- a/mm/slob.c +++ b/mm/slob.c @@ -475,6 +475,8 @@ void *__kmalloc_node(size_t size, gfp_t gfp, int node) unsigned int *m; int align = max(ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN); + lockdep_trace_alloc(gfp); + if (size < PAGE_SIZE - align) { if (!size) return ZERO_SIZE_PTR; |