On Tue, Mar 24, 2009 at 08:21:28AM +0000, Pekka Enberg wrote: > Commit-ID: 9d47aa18654e4344b1d20b14463addee676e9ea4 > Gitweb: http://git.kernel.org/tip/9d47aa18654e4344b1d20b14463addee676e9ea4 > Author: Pekka Enberg <penberg@xxxxxxxxxxxxxx> > AuthorDate: Tue, 24 Mar 2009 10:14:30 +0200 > Committer: Ingo Molnar <mingo@xxxxxxx> > 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. > > Signed-off-by: Pekka Enberg <penberg@xxxxxxxxxxxxxx> > Cc: Eduard - Gabriel Munteanu <eduard.munteanu@xxxxxxxxxxx> > LKML-Reference: <1237882470.25315.30.camel@penberg-laptop> > Signed-off-by: Ingo Molnar <mingo@xxxxxxx> > > > --- > include/trace/kmemtrace.h | 24 ++++++++++++------------ > 1 files changed, 12 insertions(+), 12 deletions(-) > > diff --git a/include/trace/kmemtrace.h b/include/trace/kmemtrace.h > index 9e28ae1..7514476 100644 > --- a/include/trace/kmemtrace.h > +++ b/include/trace/kmemtrace.h > @@ -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__ */ > Thanks, I was clueless. I thought the problem was similar to the RCU stuff. Eduard -- To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
|