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/slob.c | |
| parent | 2602c3ba4508f528db024c1d209256513ea05de6 (diff) | |
| parent | 1075414b06109a99b0e87601e84c74a95bd45681 (diff) | |
| download | linux-28b1bd1cbc33cae95a309691d814399a69cf3070.tar.gz linux-28b1bd1cbc33cae95a309691d814399a69cf3070.tar.bz2 linux-28b1bd1cbc33cae95a309691d814399a69cf3070.zip | |
Merge branch 'core/locking' into tracing/ftrace
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 f9cc24688232..596152926a8d 100644 --- a/mm/slob.c +++ b/mm/slob.c @@ -466,6 +466,8 @@ void *__kmalloc_node(size_t size, gfp_t gfp, int node) int align = max(ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN); void *ret; + lockdep_trace_alloc(flags); + if (size < PAGE_SIZE - align) { if (!size) return ZERO_SIZE_PTR; |