Skip to contentSkip to conversation

kmemtrace: fix tracepoint declarations

PATCH In review Pekka Enberg 2 participants 3 messages Mar 24, 2009 Tracing

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 kmemtrace: fix tracepoint declarations

From: Pekka Enberg <[email protected]>

Impact: fix build

Use the new TP_PROTO and TP_ARGS to fix the build.

Cc Eduard - Gabriel Munteanu <[email protected]>
---
 include/trace/kmemtrace.h |   24 ++++++++++++------------
 1 files changed, 12 insertions(+), 12 deletions(-)
include/trace/kmemtrace.h +12 -12
index 9e28ae1..7514476 100644
@@ -15,41 +15,41 @@
 extern void kmemtrace_init(void);
 
 DECLARE_TRACE(kmalloc,
-	      TPPROTO(unsigned long call_site,
+	      TP_PROTO(unsigned long call_site,
 		      const void *ptr,
 		      size_t bytes_req,
 		      size_t bytes_alloc,
 		      gfp_t gfp_flags),
-	      TPARGS(call_site, ptr, bytes_req, bytes_alloc, gfp_flags));
+	      TP_ARGS(call_site, ptr, bytes_req, bytes_alloc, gfp_flags));
 DECLARE_TRACE(kmem_cache_alloc,
-	      TPPROTO(unsigned long call_site,
+	      TP_PROTO(unsigned long call_site,
 		      const void *ptr,
 		      size_t bytes_req,
 		      size_t bytes_alloc,
 		      gfp_t gfp_flags),
-	      TPARGS(call_site, ptr, bytes_req, bytes_alloc, gfp_flags));
+	      TP_ARGS(call_site, ptr, bytes_req, bytes_alloc, gfp_flags));
 DECLARE_TRACE(kmalloc_node,
-	      TPPROTO(unsigned long call_site,
+	      TP_PROTO(unsigned long call_site,
 		      const void *ptr,
 		      size_t bytes_req,
 		      size_t bytes_alloc,
 		      gfp_t gfp_flags,
 		      int node),
-	      TPARGS(call_site, ptr, bytes_req, bytes_alloc, gfp_flags, node));
+	      TP_ARGS(call_site, ptr, bytes_req, bytes_alloc, gfp_flags, node));
 DECLARE_TRACE(kmem_cache_alloc_node,
-	      TPPROTO(unsigned long call_site,
+	      TP_PROTO(unsigned long call_site,
 		      const void *ptr,
 		      size_t bytes_req,
 		      size_t bytes_alloc,
 		      gfp_t gfp_flags,
 		      int node),
-	      TPARGS(call_site, ptr, bytes_req, bytes_alloc, gfp_flags, node));
+	      TP_ARGS(call_site, ptr, bytes_req, bytes_alloc, gfp_flags, node));
 DECLARE_TRACE(kfree,
-	      TPPROTO(unsigned long call_site, const void *ptr),
-	      TPARGS(call_site, ptr));
+	      TP_PROTO(unsigned long call_site, const void *ptr),
+	      TP_ARGS(call_site, ptr));
 DECLARE_TRACE(kmem_cache_free,
-	      TPPROTO(unsigned long call_site, const void *ptr),
-	      TPARGS(call_site, ptr));
+	      TP_PROTO(unsigned long call_site, const void *ptr),
+	      TP_ARGS(call_site, ptr));
 
 #endif /* __KERNEL__ */
 
Signature · 1 line
1.5.4.3
#1 lore raw
Commit-ID:  9d47aa18654e4344b1d20b14463addee676e9ea4
Gitweb:     http://git.kernel.org/tip/9d47aa18654e4344b1d20b14463addee676e9ea4
Author:     Pekka Enberg <[email protected]>
AuthorDate: Tue, 24 Mar 2009 10:14:30 +0200
Committer:  Ingo Molnar <[email protected]>
CommitDate: Tue, 24 Mar 2009 09:19:52 +0100

kmemtrace: fix tracepoint declarations

Impact: build fix

Use the new TP_PROTO and TP_ARGS to fix the build.

Cc Eduard - Gabriel Munteanu <[email protected]>

LKML-Reference: <1237882470.25315.30.camel@penberg-laptop>

---
 include/trace/kmemtrace.h |   24 ++++++++++++------------
 1 files changed, 12 insertions(+), 12 deletions(-)
include/trace/kmemtrace.h +12 -12
index 9e28ae1..7514476 100644
@@ -15,41 +15,41 @@
 extern void kmemtrace_init(void);
 
 DECLARE_TRACE(kmalloc,
-	      TPPROTO(unsigned long call_site,
+	      TP_PROTO(unsigned long call_site,
 		      const void *ptr,
 		      size_t bytes_req,
 		      size_t bytes_alloc,
 		      gfp_t gfp_flags),
-	      TPARGS(call_site, ptr, bytes_req, bytes_alloc, gfp_flags));
+	      TP_ARGS(call_site, ptr, bytes_req, bytes_alloc, gfp_flags));
 DECLARE_TRACE(kmem_cache_alloc,
-	      TPPROTO(unsigned long call_site,
+	      TP_PROTO(unsigned long call_site,
 		      const void *ptr,
 		      size_t bytes_req,
 		      size_t bytes_alloc,
 		      gfp_t gfp_flags),
-	      TPARGS(call_site, ptr, bytes_req, bytes_alloc, gfp_flags));
+	      TP_ARGS(call_site, ptr, bytes_req, bytes_alloc, gfp_flags));
 DECLARE_TRACE(kmalloc_node,
-	      TPPROTO(unsigned long call_site,
+	      TP_PROTO(unsigned long call_site,
 		      const void *ptr,
 		      size_t bytes_req,
 		      size_t bytes_alloc,
 		      gfp_t gfp_flags,
 		      int node),
-	      TPARGS(call_site, ptr, bytes_req, bytes_alloc, gfp_flags, node));
+	      TP_ARGS(call_site, ptr, bytes_req, bytes_alloc, gfp_flags, node));
 DECLARE_TRACE(kmem_cache_alloc_node,
-	      TPPROTO(unsigned long call_site,
+	      TP_PROTO(unsigned long call_site,
 		      const void *ptr,
 		      size_t bytes_req,
 		      size_t bytes_alloc,
 		      gfp_t gfp_flags,
 		      int node),
-	      TPARGS(call_site, ptr, bytes_req, bytes_alloc, gfp_flags, node));
+	      TP_ARGS(call_site, ptr, bytes_req, bytes_alloc, gfp_flags, node));
 DECLARE_TRACE(kfree,
-	      TPPROTO(unsigned long call_site, const void *ptr),
-	      TPARGS(call_site, ptr));
+	      TP_PROTO(unsigned long call_site, const void *ptr),
+	      TP_ARGS(call_site, ptr));
 DECLARE_TRACE(kmem_cache_free,
-	      TPPROTO(unsigned long call_site, const void *ptr),
-	      TPARGS(call_site, ptr));
+	      TP_PROTO(unsigned long call_site, const void *ptr),
+	      TP_ARGS(call_site, ptr));
 
 #endif /* __KERNEL__ */
 
#2 lore raw
Quoted 71 lines · Pekka Enberg
Commit-ID:  9d47aa18654e4344b1d20b14463addee676e9ea4
Gitweb:     http://git.kernel.org/tip/9d47aa18654e4344b1d20b14463addee676e9ea4
Author:     Pekka Enberg <[email protected]>
AuthorDate: Tue, 24 Mar 2009 10:14:30 +0200
Committer:  Ingo Molnar <[email protected]>
CommitDate: Tue, 24 Mar 2009 09:19:52 +0100

kmemtrace: fix tracepoint declarations

Impact: build fix

Use the new TP_PROTO and TP_ARGS to fix the build.

Cc Eduard - Gabriel Munteanu <[email protected]>

LKML-Reference: <1237882470.25315.30.camel@penberg-laptop>

---
 include/trace/kmemtrace.h |   24 ++++++++++++------------
 1 files changed, 12 insertions(+), 12 deletions(-)
include/trace/kmemtrace.h +8 -10
index 9e28ae1..7514476 100644
@@ -15,41 +15,41 @@
 extern void kmemtrace_init(void);
 
 DECLARE_TRACE(kmalloc,
-	      TPPROTO(unsigned long call_site,
+	      TP_PROTO(unsigned long call_site,
 		      const void *ptr,
 		      size_t bytes_req,
 		      size_t bytes_alloc,
 		      gfp_t gfp_flags),
-	      TPARGS(call_site, ptr, bytes_req, bytes_alloc, gfp_flags));
+	      TP_ARGS(call_site, ptr, bytes_req, bytes_alloc, gfp_flags));
 DECLARE_TRACE(kmem_cache_alloc,
-	      TPPROTO(unsigned long call_site,
+	      TP_PROTO(unsigned long call_site,
 		      const void *ptr,
 		      size_t bytes_req,
 		      size_t bytes_alloc,
 		      gfp_t gfp_flags),
-	      TPARGS(call_site, ptr, bytes_req, bytes_alloc, gfp_flags));
+	      TP_ARGS(call_site, ptr, bytes_req, bytes_alloc, gfp_flags));
 DECLARE_TRACE(kmalloc_node,
-	      TPPROTO(unsigned long call_site,
+	      TP_PROTO(unsigned long call_site,
 		      const void *ptr,
 		      size_t bytes_req,
 		      size_t bytes_alloc,
 		      gfp_t gfp_flags,
 		      int node),
-	      TPARGS(call_site, ptr, bytes_req, bytes_alloc, gfp_flags, node));
+	      TP_ARGS(call_site, ptr, bytes_req, bytes_alloc, gfp_flags, node));
 DECLARE_TRACE(kmem_cache_alloc_node,
-	      TPPROTO(unsigned long call_site,
+	      TP_PROTO(unsigned long call_site,
 		      const void *ptr,
 		      size_t bytes_req,
 		      size_t bytes_alloc,
 		      gfp_t gfp_flags,
 		      int node),
-	      TPARGS(call_site, ptr, bytes_req, bytes_alloc, gfp_flags, node));
+	      TP_ARGS(call_site, ptr, bytes_req, bytes_alloc, gfp_flags, node));
 DECLARE_TRACE(kfree,
-	      TPPROTO(unsigned long call_site, const void *ptr),
-	      TPARGS(call_site, ptr));

include/trace/kmemtrace.h line 55

Quoted 10 lines
include/trace/kmemtrace.h +4 -2
+	      TP_PROTO(unsigned long call_site, const void *ptr),
+	      TP_ARGS(call_site, ptr));
 DECLARE_TRACE(kmem_cache_free,
-	      TPPROTO(unsigned long call_site, const void *ptr),
-	      TPARGS(call_site, ptr));
+	      TP_PROTO(unsigned long call_site, const void *ptr),
+	      TP_ARGS(call_site, ptr));
 
 #endif /* __KERNEL__ */
 

Thanks, I was clueless. I thought the problem was similar to the RCU stuff.

Eduard