aboutsummaryrefslogtreecommitdiffstats
path: root/mm/slob.c
diff options
context:
space:
mode:
authorPekka Enberg <penberg@cs.helsinki.fi>2009-03-25 05:05:57 -0400
committerIngo Molnar <mingo@elte.hu>2009-04-03 06:23:10 -0400
commit2121db74ba0fd2259f0e2265511684fadda9ac49 (patch)
tree823401f3bce7018535ceea69103a28accd5794f7 /mm/slob.c
parentc826e3cd0c931d60d548f2468122da570d145556 (diff)
kmemtrace: trace kfree() calls with NULL or zero-length objects
Impact: also output kfree(NULL) entries This patch moves the trace_kfree() calls before the ZERO_OR_NULL_PTR check so that we can trace call-sites that call kfree() with NULL many times which might be an indication of a bug. Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi> Cc: Eduard - Gabriel Munteanu <eduard.munteanu@linux360.ro> LKML-Reference: <1237971957.30175.18.camel@penberg-laptop> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'mm/slob.c')
-rw-r--r--mm/slob.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/mm/slob.c b/mm/slob.c
index 00003587ebfa..a2d4ab32198d 100644
--- a/mm/slob.c
+++ b/mm/slob.c
@@ -514,6 +514,8 @@ void kfree(const void *block)
514{ 514{
515 struct slob_page *sp; 515 struct slob_page *sp;
516 516
517 trace_kfree(_RET_IP_, block);
518
517 if (unlikely(ZERO_OR_NULL_PTR(block))) 519 if (unlikely(ZERO_OR_NULL_PTR(block)))
518 return; 520 return;
519 521
@@ -524,8 +526,6 @@ void kfree(const void *block)
524 slob_free(m, *m + align); 526 slob_free(m, *m + align);
525 } else 527 } else
526 put_page(&sp->page); 528 put_page(&sp->page);
527
528 trace_kfree(_RET_IP_, block);
529} 529}
530EXPORT_SYMBOL(kfree); 530EXPORT_SYMBOL(kfree);
531 531