Hi all, On Thu, 19 Mar 2009 15:46:17 +1100 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote: > > Today's linux-next build (powerpc ppc64_defconfig) failed like this: > > In file included from net/core/skbuff.c:69: > include/trace/skb.h:4: error: expected ')' before '(' token > include/trace/skb.h:4: error: expected ')' before '(' token > include/trace/skb.h:4: warning: function declaration isn't a prototype > include/trace/skb.h: In function 'register_trace_kfree_skb': > include/trace/skb.h:4: error: 'probe' undeclared (first use in this function) > include/trace/skb.h:4: error: (Each undeclared identifier is reported only once > include/trace/skb.h:4: error: for each function it appears in.) > include/trace/skb.h: At top level: > include/trace/skb.h:4: error: expected ')' before '(' token > include/trace/skb.h:4: warning: function declaration isn't a prototype > include/trace/skb.h: In function 'unregister_trace_kfree_skb': > include/trace/skb.h:4: error: 'probe' undeclared (first use in this function) > net/core/skbuff.c: In function 'kfree_skb': > net/core/skbuff.c:446: error: implicit declaration of function 'trace_kfree_skb' > > Caused by commit 2939b0469d04ba9ac791aca9a81625d7eb50662b ("tracing: > replace TP<var> with TP_<var>") from the tracing tree interacting with > commit 4893d39e865b2897bf9fcd329697d37032d853a1 ("Network Drop Monitor: > Add trace declaration for skb frees") from the net tree. > > I added the merge fixup below and can carry it as necessary. This patch should now be applicable to the tracing tree. diff --git a/include/trace/skb.h b/include/trace/skb.h index 3aa8646..d9679c2 100644 --- a/include/trace/skb.h +++ b/include/trace/skb.h @@ -2,7 +2,7 @@ #define _TRACE_SKB_H_ DECLARE_TRACE(kfree_skb, - TPPROTO(struct sk_buff *skb, void *location), - TPARGS(skb, location)); + TP_PROTO(struct sk_buff *skb, void *location), + TP_ARGS(skb, location)); #endif -- 1.6.2.1 -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx http://www.canb.auug.org.au/~sfr/ -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html