diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-05 10:20:47 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-05 10:20:47 +0100 |
| commit | c4ef144a9d0803eb0a2d4110ae87e7f34e667ded (patch) | |
| tree | b4b5e472bafb3d5d0d8ea26680e1d8cc87365c30 /mm/slob.c | |
| parent | a1be621dfacbef0fd374d8acd553d71e07bf29ac (diff) | |
| parent | efed792d6738964f399a508ef9e831cd60fa4657 (diff) | |
Merge branch 'tracing/ftrace' into tracing/core
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; |