aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXiaotian Feng <dfeng@redhat.com>2010-04-08 05:26:44 -0400
committerPekka Enberg <penberg@cs.helsinki.fi>2010-05-22 03:57:31 -0400
commitd3e14aa336b37df76ae875fa051dfdb0e765ddf9 (patch)
treeda3b3e552002d0fc8d85d54b81f0b488b043e230
parentbbd7d57bfe852d9788bae5fb171c7edb4021d8ac (diff)
slub: __kmalloc_node_track_caller should trace kmalloc_large_node case
commit 94b528d (kmemtrace: SLUB hooks for caller-tracking functions) missed tracing kmalloc_large_node in __kmalloc_node_track_caller. We should trace it same as __kmalloc_node. Acked-by: David Rientjes <rientjes@google.com> Cc: Matt Mackall <mpm@selenic.com> Cc: Ingo Molnar <mingo@elte.hu> Cc: Vegard Nossum <vegard.nossum@gmail.com> Signed-off-by: Xiaotian Feng <dfeng@redhat.com> Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
-rw-r--r--mm/slub.c11
1 files changed, 9 insertions, 2 deletions
diff --git a/mm/slub.c b/mm/slub.c
index 78f1a202ca33..52ae5a538180 100644
--- a/mm/slub.c
+++ b/mm/slub.c
@@ -3341,8 +3341,15 @@ void *__kmalloc_node_track_caller(size_t size, gfp_t gfpflags,
3341 struct kmem_cache *s; 3341 struct kmem_cache *s;
3342 void *ret; 3342 void *ret;
3343 3343
3344 if (unlikely(size > SLUB_MAX_SIZE)) 3344 if (unlikely(size > SLUB_MAX_SIZE)) {
3345 return kmalloc_large_node(size, gfpflags, node); 3345 ret = kmalloc_large_node(size, gfpflags, node);
3346
3347 trace_kmalloc_node(caller, ret,
3348 size, PAGE_SIZE << get_order(size),
3349 gfpflags, node);
3350
3351 return ret;
3352 }
3346 3353
3347 s = get_slab(size, gfpflags); 3354 s = get_slab(size, gfpflags);
3348 3355