aboutsummaryrefslogtreecommitdiffstats
path: root/mm/slub.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/slub.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/slub.c')
-rw-r--r--mm/slub.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/mm/slub.c b/mm/slub.c
index a98078bf738b..7ab54ecbd3f3 100644
--- a/mm/slub.c
+++ b/mm/slub.c
@@ -2792,6 +2792,8 @@ void kfree(const void *x)
2792 struct page *page; 2792 struct page *page;
2793 void *object = (void *)x; 2793 void *object = (void *)x;
2794 2794
2795 trace_kfree(_RET_IP_, x);
2796
2795 if (unlikely(ZERO_OR_NULL_PTR(x))) 2797 if (unlikely(ZERO_OR_NULL_PTR(x)))
2796 return; 2798 return;
2797 2799
@@ -2802,8 +2804,6 @@ void kfree(const void *x)
2802 return; 2804 return;
2803 } 2805 }
2804 slab_free(page->slab, page, object, _RET_IP_); 2806 slab_free(page->slab, page, object, _RET_IP_);
2805
2806 trace_kfree(_RET_IP_, x);
2807} 2807}
2808EXPORT_SYMBOL(kfree); 2808EXPORT_SYMBOL(kfree);
2809 2809