From 334756775a912534fc19ade55d58bedd050934f2 Mon Sep 17 00:00:00 2001
From: Neil Horman <nhorman@tuxdriver.com>
Date: Mon, 23 Aug 2010 18:43:51 +0900
Subject: [PATCH] --- yaml --- r: 211809 b: refs/heads/master c:
 3e4b10d7a4d2a78af64f8096dc7cdb3bebd65adb h: refs/heads/master i:   211807:
 d82fb099453f48aec64c4c80340e7c4f1e6e13ec v: v3

---
 [refs]                            |  2 +-
 trunk/include/trace/events/napi.h | 25 +++++++++++++++++++++++--
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 5920ff224408..78f2de6b8ca6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2bf2160d8805de64308e2e7c3cd97813cb58ed2f
+refs/heads/master: 3e4b10d7a4d2a78af64f8096dc7cdb3bebd65adb
diff --git a/trunk/include/trace/events/napi.h b/trunk/include/trace/events/napi.h
index 188deca2f3c7..8fe1e93f531d 100644
--- a/trunk/include/trace/events/napi.h
+++ b/trunk/include/trace/events/napi.h
@@ -6,10 +6,31 @@
 
 #include <linux/netdevice.h>
 #include <linux/tracepoint.h>
+#include <linux/ftrace.h>
+
+#define NO_DEV "(no_device)"
+
+TRACE_EVENT(napi_poll,
 
-DECLARE_TRACE(napi_poll,
 	TP_PROTO(struct napi_struct *napi),
-	TP_ARGS(napi));
+
+	TP_ARGS(napi),
+
+	TP_STRUCT__entry(
+		__field(	struct napi_struct *,	napi)
+		__string(	dev_name, napi->dev ? napi->dev->name : NO_DEV)
+	),
+
+	TP_fast_assign(
+		__entry->napi = napi;
+		__assign_str(dev_name, napi->dev ? napi->dev->name : NO_DEV);
+	),
+
+	TP_printk("napi poll on napi struct %p for device %s",
+		__entry->napi, __get_str(dev_name))
+);
+
+#undef NO_DEV
 
 #endif /* _TRACE_NAPI_H_ */