Skip to content

Commit

Permalink
tracing, net: fix net tree and tracing tree merge interaction
Browse files Browse the repository at this point in the history
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 2939b04 ("tracing:
replace TP<var> with TP_<var>") from the tracing tree interacting with
commit 4893d39 ("Network Drop Monitor:
Add trace declaration for skb frees") from the net tree.

Acked-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
  • Loading branch information
sfrothwell authored and Ingo Molnar committed Apr 1, 2009
1 parent a095bdb commit 645dae9
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions include/trace/skb.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#include <linux/tracepoint.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

0 comments on commit 645dae9

Please sign in to comment.