kmemtrace: use tracepoints

kmemtrace now uses tracepoints instead of markers. We no longer need to
use format specifiers to pass arguments.

Signed-off-by: Eduard - Gabriel Munteanu <eduard.munteanu@linux360.ro>
[ folded: Use the new TP_PROTO and TP_ARGS to fix the build.     ]
[ folded: fix build when CONFIG_KMEMTRACE is disabled.           ]
[ folded: define tracepoints when CONFIG_TRACEPOINTS is enabled. ]
Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
LKML-Reference: <ae61c0f37156db8ec8dc0d5778018edde60a92e3.1237813499.git.eduard.munteanu@linux360.ro>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 12 insertions, 16 deletions

diff --git a/mm/slob.c b/mm/slob.c
index 4dd6516447f2..00003587ebfa 100644
--- a/mm/slob.c
+++ b/mm/slob.c
@@ -490,9 +490,8 @@ void *__kmalloc_node(size_t size, gfp_t gfp, int node)
                 *m = size;
                 ret = (void *)m + align;
 
-                kmemtrace_mark_alloc_node(KMEMTRACE_TYPE_KMALLOC,
-                                          _RET_IP_, ret,
-                                          size, size + align, gfp, node);
+                trace_kmalloc_node(_RET_IP_, ret,
+                                   size, size + align, gfp, node);
         } else {
                 unsigned int order = get_order(size);
 
@@ -503,9 +502,8 @@ void *__kmalloc_node(size_t size, gfp_t gfp, int node)
                         page->private = size;
                 }
 
-                kmemtrace_mark_alloc_node(KMEMTRACE_TYPE_KMALLOC,
-                                          _RET_IP_, ret,
-                                          size, PAGE_SIZE << order, gfp, node);
+                trace_kmalloc_node(_RET_IP_, ret,
+                                   size, PAGE_SIZE << order, gfp, node);
         }
 
         return ret;
@@ -527,7 +525,7 @@ void kfree(const void *block)
         } else
                 put_page(&sp->page);
 
-        kmemtrace_mark_free(KMEMTRACE_TYPE_KMALLOC, _RET_IP_, block);
+        trace_kfree(_RET_IP_, block);
 }
 EXPORT_SYMBOL(kfree);
 
@@ -599,16 +597,14 @@ void *kmem_cache_alloc_node(struct kmem_cache *c, gfp_t flags, int node)
 
         if (c->size < PAGE_SIZE) {
                 b = slob_alloc(c->size, flags, c->align, node);
-                kmemtrace_mark_alloc_node(KMEMTRACE_TYPE_CACHE,
-                                          _RET_IP_, b, c->size,
-                                          SLOB_UNITS(c->size) * SLOB_UNIT,
-                                          flags, node);
+                trace_kmem_cache_alloc_node(_RET_IP_, b, c->size,
+                                            SLOB_UNITS(c->size) * SLOB_UNIT,
+                                            flags, node);
         } else {
                 b = slob_new_pages(flags, get_order(c->size), node);
-                kmemtrace_mark_alloc_node(KMEMTRACE_TYPE_CACHE,
-                                          _RET_IP_, b, c->size,
-                                          PAGE_SIZE << get_order(c->size),
-                                          flags, node);
+                trace_kmem_cache_alloc_node(_RET_IP_, b, c->size,
+                                            PAGE_SIZE << get_order(c->size),
+                                            flags, node);
         }
 
         if (c->ctor)
@@ -646,7 +642,7 @@ void kmem_cache_free(struct kmem_cache *c, void *b)
                 __kmem_cache_free(b, c->size);
         }
 
-        kmemtrace_mark_free(KMEMTRACE_TYPE_CACHE, _RET_IP_, b);
+        trace_kmem_cache_free(_RET_IP_, b);
 }
 EXPORT_SYMBOL(kmem_cache_free);