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, 11 insertions, 13 deletions

diff --git a/mm/slab.c b/mm/slab.c
index 9ec66c3e6ee0..fa00fd6a644d 100644
--- a/mm/slab.c
+++ b/mm/slab.c
@@ -3565,8 +3565,8 @@ void *kmem_cache_alloc(struct kmem_cache *cachep, gfp_t flags)
 {
         void *ret = __cache_alloc(cachep, flags, __builtin_return_address(0));
 
-        kmemtrace_mark_alloc(KMEMTRACE_TYPE_CACHE, _RET_IP_, ret,
-                             obj_size(cachep), cachep->buffer_size, flags);
+        trace_kmem_cache_alloc(_RET_IP_, ret,
+                               obj_size(cachep), cachep->buffer_size, flags);
 
         return ret;
 }
@@ -3627,9 +3627,9 @@ void *kmem_cache_alloc_node(struct kmem_cache *cachep, gfp_t flags, int nodeid)
         void *ret = __cache_alloc_node(cachep, flags, nodeid,
                                        __builtin_return_address(0));
 
-        kmemtrace_mark_alloc_node(KMEMTRACE_TYPE_CACHE, _RET_IP_, ret,
-                                  obj_size(cachep), cachep->buffer_size,
-                                  flags, nodeid);
+        trace_kmem_cache_alloc_node(_RET_IP_, ret,
+                                    obj_size(cachep), cachep->buffer_size,
+                                    flags, nodeid);
 
         return ret;
 }
@@ -3657,9 +3657,8 @@ __do_kmalloc_node(size_t size, gfp_t flags, int node, void *caller)
                 return cachep;
         ret = kmem_cache_alloc_node_notrace(cachep, flags, node);
 
-        kmemtrace_mark_alloc_node(KMEMTRACE_TYPE_KMALLOC,
-                                  (unsigned long) caller, ret,
-                                  size, cachep->buffer_size, flags, node);
+        trace_kmalloc_node((unsigned long) caller, ret,
+                           size, cachep->buffer_size, flags, node);
 
         return ret;
 }
@@ -3709,9 +3708,8 @@ static __always_inline void *__do_kmalloc(size_t size, gfp_t flags,
                 return cachep;
         ret = __cache_alloc(cachep, flags, caller);
 
-        kmemtrace_mark_alloc(KMEMTRACE_TYPE_KMALLOC,
-                             (unsigned long) caller, ret,
-                             size, cachep->buffer_size, flags);
+        trace_kmalloc((unsigned long) caller, ret,
+                      size, cachep->buffer_size, flags);
 
         return ret;
 }
@@ -3757,7 +3755,7 @@ void kmem_cache_free(struct kmem_cache *cachep, void *objp)
         __cache_free(cachep, objp);
         local_irq_restore(flags);
 
-        kmemtrace_mark_free(KMEMTRACE_TYPE_CACHE, _RET_IP_, objp);
+        trace_kmem_cache_free(_RET_IP_, objp);
 }
 EXPORT_SYMBOL(kmem_cache_free);
 
@@ -3785,7 +3783,7 @@ void kfree(const void *objp)
         __cache_free(c, (void *)objp);
         local_irq_restore(flags);
 
-        kmemtrace_mark_free(KMEMTRACE_TYPE_KMALLOC, _RET_IP_, objp);
+        trace_kfree(_RET_IP_, objp);
 }
 EXPORT_SYMBOL(kfree);