Commit-ID: 645dae969c3b8651c5bc7c54a1835ec03820f85f
Gitweb: http://git.kernel.org/tip/645dae969c3b8651c5bc7c54a1835ec03820f85f
Author: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
AuthorDate: Thu, 19 Mar 2009 15:46:17 +1100
Committer: Ingo Molnar <mingo@xxxxxxx>
CommitDate: Thu, 2 Apr 2009 00:50:30 +0200
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@xxxxxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
---
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 a96610f..b66206d 100644
--- a/include/trace/skb.h
+++ b/include/trace/skb.h
@@ -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
--
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
|