summaryrefslogtreecommitdiffstats
path: root/include/trace/events/napi.h
diff options
context:
space:
mode:
authorDavid S. Miller2009-06-15 12:02:23 +0200
committerDavid S. Miller2009-06-15 12:02:23 +0200
commit9cbc1cb8cd46ce1f7645b9de249b2ce8460129bb (patch)
tree8d104ec2a459346b99413b0b77421ca7b9936c1a /include/trace/events/napi.h
parentpkt_sched: Rename PSCHED_US2NS and PSCHED_NS2US (diff)
parentMerge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/sam/kb... (diff)
downloadkernel-qcow2-linux-9cbc1cb8cd46ce1f7645b9de249b2ce8460129bb.tar.gz
kernel-qcow2-linux-9cbc1cb8cd46ce1f7645b9de249b2ce8460129bb.tar.xz
kernel-qcow2-linux-9cbc1cb8cd46ce1f7645b9de249b2ce8460129bb.zip
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts: Documentation/feature-removal-schedule.txt drivers/scsi/fcoe/fcoe.c net/core/drop_monitor.c net/core/net-traces.c
Diffstat (limited to 'include/trace/events/napi.h')
-rw-r--r--include/trace/events/napi.h11
1 files changed, 11 insertions, 0 deletions
diff --git a/include/trace/events/napi.h b/include/trace/events/napi.h
new file mode 100644
index 000000000000..a8989c4547e7
--- /dev/null
+++ b/include/trace/events/napi.h
@@ -0,0 +1,11 @@
+#ifndef _TRACE_NAPI_H_
+#define _TRACE_NAPI_H_
+
+#include <linux/netdevice.h>
+#include <linux/tracepoint.h>
+
+DECLARE_TRACE(napi_poll,
+ TP_PROTO(struct napi_struct *napi),
+ TP_ARGS(napi));
+
+#endif