Commit 645dae96 authored by Stephen Rothwell's avatar Stephen Rothwell Committed by Ingo Molnar

tracing, net: fix net tree and tracing tree merge interaction

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
 [...]

Caused by commit 2939b046 ("tracing:
replace TP<var> with TP_<var>") from the tracing tree interacting with
commit 4893d39e ("Network Drop Monitor:
Add trace declaration for skb frees") from the net tree.
Acked-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent a095bdbb
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
#include <linux/tracepoint.h> #include <linux/tracepoint.h>
DECLARE_TRACE(kfree_skb, DECLARE_TRACE(kfree_skb,
TPPROTO(struct sk_buff *skb, void *location), TP_PROTO(struct sk_buff *skb, void *location),
TPARGS(skb, location)); TP_ARGS(skb, location));
#endif #endif
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment