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/slob.c | |
parent | 2602c3ba4508f528db024c1d209256513ea05de6 (diff) | |
parent | 1075414b06109a99b0e87601e84c74a95bd45681 (diff) |
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
@@ -466,6 +466,8 @@ void *__kmalloc_node(size_t size, gfp_t gfp, int node) | |||
466 | int align = max(ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN); | 466 | int align = max(ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN); |
467 | void *ret; | 467 | void *ret; |
468 | 468 | ||
469 | lockdep_trace_alloc(flags); | ||
470 | |||
469 | if (size < PAGE_SIZE - align) { | 471 | if (size < PAGE_SIZE - align) { |
470 | if (!size) | 472 | if (!size) |
471 | return ZERO_SIZE_PTR; | 473 | return ZERO_SIZE_PTR; |