Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

[safe/jmp/linux-2.6] / include / trace / kmemtrace.h

diff --git a/include/trace/kmemtrace.h b/include/trace/kmemtrace.h
index ad8b785..28ee69f 100644 (file)
--- a/include/trace/kmemtrace.h
+++ b/include/trace/kmemtrace.h
@@ -9,65 +9,53 @@
 
 #ifdef __KERNEL__
 
+#include <linux/tracepoint.h>
 #include <linux/types.h>
-#include <linux/marker.h>
-
-enum kmemtrace_type_id {
-       KMEMTRACE_TYPE_KMALLOC = 0,     /* kmalloc() or kfree(). */
-       KMEMTRACE_TYPE_CACHE,           /* kmem_cache_*(). */
-       KMEMTRACE_TYPE_PAGES,           /* __get_free_pages() and friends. */
-};
 
 #ifdef CONFIG_KMEMTRACE
-
 extern void kmemtrace_init(void);
-
-extern void kmemtrace_mark_alloc_node(enum kmemtrace_type_id type_id,
-                                            unsigned long call_site,
-                                            const void *ptr,
-                                            size_t bytes_req,
-                                            size_t bytes_alloc,
-                                            gfp_t gfp_flags,
-                                            int node);
-
-extern void kmemtrace_mark_free(enum kmemtrace_type_id type_id,
-                                      unsigned long call_site,
-                                      const void *ptr);
-
-#else /* CONFIG_KMEMTRACE */
-
+#else
 static inline void kmemtrace_init(void)
 {
 }
-
-static inline void kmemtrace_mark_alloc_node(enum kmemtrace_type_id type_id,
-                                            unsigned long call_site,
-                                            const void *ptr,
-                                            size_t bytes_req,
-                                            size_t bytes_alloc,
-                                            gfp_t gfp_flags,
-                                            int node)
-{
-}
-
-static inline void kmemtrace_mark_free(enum kmemtrace_type_id type_id,
-                                      unsigned long call_site,
-                                      const void *ptr)
-{
-}
-
-#endif /* CONFIG_KMEMTRACE */
-
-static inline void kmemtrace_mark_alloc(enum kmemtrace_type_id type_id,
-                                       unsigned long call_site,
-                                       const void *ptr,
-                                       size_t bytes_req,
-                                       size_t bytes_alloc,
-                                       gfp_t gfp_flags)
-{
-       kmemtrace_mark_alloc_node(type_id, call_site, ptr,
-                                 bytes_req, bytes_alloc, gfp_flags, -1);
-}
+#endif
+
+DECLARE_TRACE(kmalloc,
+             TP_PROTO(unsigned long call_site,
+                     const void *ptr,
+                     size_t bytes_req,
+                     size_t bytes_alloc,
+                     gfp_t gfp_flags),
+             TP_ARGS(call_site, ptr, bytes_req, bytes_alloc, gfp_flags));
+DECLARE_TRACE(kmem_cache_alloc,
+             TP_PROTO(unsigned long call_site,
+                     const void *ptr,
+                     size_t bytes_req,
+                     size_t bytes_alloc,
+                     gfp_t gfp_flags),
+             TP_ARGS(call_site, ptr, bytes_req, bytes_alloc, gfp_flags));
+DECLARE_TRACE(kmalloc_node,
+             TP_PROTO(unsigned long call_site,
+                     const void *ptr,
+                     size_t bytes_req,
+                     size_t bytes_alloc,
+                     gfp_t gfp_flags,
+                     int node),
+             TP_ARGS(call_site, ptr, bytes_req, bytes_alloc, gfp_flags, node));
+DECLARE_TRACE(kmem_cache_alloc_node,
+             TP_PROTO(unsigned long call_site,
+                     const void *ptr,
+                     size_t bytes_req,
+                     size_t bytes_alloc,
+                     gfp_t gfp_flags,
+                     int node),
+             TP_ARGS(call_site, ptr, bytes_req, bytes_alloc, gfp_flags, node));
+DECLARE_TRACE(kfree,
+             TP_PROTO(unsigned long call_site, const void *ptr),
+             TP_ARGS(call_site, ptr));
+DECLARE_TRACE(kmem_cache_free,
+             TP_PROTO(unsigned long call_site, const void *ptr),
+             TP_ARGS(call_site, ptr));
 
 #endif /* __KERNEL__ */