summaryrefslogtreecommitdiffstats
path: root/include/trace/skb.h
diff options
context:
space:
mode:
authorJames Morris <jmorris@namei.org>2009-05-08 09:56:47 +0200
committerJames Morris <jmorris@namei.org>2009-05-08 09:56:47 +0200
commitd254117099d711f215e62427f55dfb8ebd5ad011 (patch)
tree0848ff8dd74314fec14a86497f8d288c86ba7c65 /include/trace/skb.h
parentintegrity: remove __setup auditing msgs (diff)
parentNOMMU: Don't check vm_region::vm_start is page aligned in add_nommu_region() (diff)
downloadlinux-d254117099d711f215e62427f55dfb8ebd5ad011.tar.xz
linux-d254117099d711f215e62427f55dfb8ebd5ad011.zip
Merge branch 'master' into next
Diffstat (limited to 'include/trace/skb.h')
-rw-r--r--include/trace/skb.h4
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 @@
#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