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>

2 files changed, 9 insertions, 13 deletions

diff --git a/include/linux/slab_def.h b/include/linux/slab_def.h
index f4523651fa42..5ac9b0bcaf9a 100644
--- a/include/linux/slab_def.h
+++ b/include/linux/slab_def.h
@@ -73,8 +73,8 @@ found:
 
                 ret = kmem_cache_alloc_notrace(cachep, flags);
 
-                kmemtrace_mark_alloc(KMEMTRACE_TYPE_KMALLOC, _THIS_IP_, ret,
-                                     size, slab_buffer_size(cachep), flags);
+                trace_kmalloc(_THIS_IP_, ret,
+                              size, slab_buffer_size(cachep), flags);
 
                 return ret;
         }
@@ -128,9 +128,9 @@ found:
 
                 ret = kmem_cache_alloc_node_notrace(cachep, flags, node);
 
-                kmemtrace_mark_alloc_node(KMEMTRACE_TYPE_KMALLOC, _THIS_IP_,
-                                          ret, size, slab_buffer_size(cachep),
-                                          flags, node);
+                trace_kmalloc_node(_THIS_IP_, ret,
+                                   size, slab_buffer_size(cachep),
+                                   flags, node);
 
                 return ret;
         }
diff --git a/include/linux/slub_def.h b/include/linux/slub_def.h
index a1f90528e70b..5046f90c1171 100644
--- a/include/linux/slub_def.h
+++ b/include/linux/slub_def.h
@@ -233,8 +233,7 @@ static __always_inline void *kmalloc_large(size_t size, gfp_t flags)
         unsigned int order = get_order(size);
         void *ret = (void *) __get_free_pages(flags | __GFP_COMP, order);
 
-        kmemtrace_mark_alloc(KMEMTRACE_TYPE_KMALLOC, _THIS_IP_, ret,
-                             size, PAGE_SIZE << order, flags);
+        trace_kmalloc(_THIS_IP_, ret, size, PAGE_SIZE << order, flags);
 
         return ret;
 }
@@ -255,9 +254,7 @@ static __always_inline void *kmalloc(size_t size, gfp_t flags)
 
                         ret = kmem_cache_alloc_notrace(s, flags);
 
-                        kmemtrace_mark_alloc(KMEMTRACE_TYPE_KMALLOC,
-                                             _THIS_IP_, ret,
-                                             size, s->size, flags);
+                        trace_kmalloc(_THIS_IP_, ret, size, s->size, flags);
 
                         return ret;
                 }
@@ -296,9 +293,8 @@ static __always_inline void *kmalloc_node(size_t size, gfp_t flags, int node)
 
                 ret = kmem_cache_alloc_node_notrace(s, flags, node);
 
-                kmemtrace_mark_alloc_node(KMEMTRACE_TYPE_KMALLOC,
-                                          _THIS_IP_, ret,
-                                          size, s->size, flags, node);
+                trace_kmalloc_node(_THIS_IP_, ret,
+                                   size, s->size, flags, node);
 
                 return ret;
         }