diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-03-19 00:46:17 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-04-01 18:50:30 -0400 |
| commit | 645dae969c3b8651c5bc7c54a1835ec03820f85f (patch) | |
| tree | bcc9a1fb2c9aa62696980209d751f8493fdefb12 | |
| parent | a095bdbb136f7bed96b7adf5aa1dd27bb2f839bf (diff) | |
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 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.
Acked-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
| -rw-r--r-- | include/trace/skb.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/trace/skb.h b/include/trace/skb.h index a96610f92f69..b66206d9be72 100644 --- a/include/trace/skb.h +++ b/include/trace/skb.h | |||
| @@ -5,7 +5,7 @@ | |||
| 5 | #include <linux/tracepoint.h> | 5 | #include <linux/tracepoint.h> |
| 6 | 6 | ||
| 7 | DECLARE_TRACE(kfree_skb, | 7 | DECLARE_TRACE(kfree_skb, |
| 8 | TPPROTO(struct sk_buff *skb, void *location), | 8 | TP_PROTO(struct sk_buff *skb, void *location), |
| 9 | TPARGS(skb, location)); | 9 | TP_ARGS(skb, location)); |
| 10 | 10 | ||
| 11 | #endif | 11 | #endif |