From f80b0d9e399c0b7fdc694303067a308cbe8497dc Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Thu, 21 May 2009 23:30:09 -0700
Subject: [PATCH] --- yaml --- r: 150363 b: refs/heads/master c:
 7d18f114897ff4358419b14d551e704a4299a440 h: refs/heads/master i:   150361:
 a7f032140b79f62719278cd84d41e7124281aa28   150359:
 b5d7140aed3d12ab8a4adef617cc298ccc4f77d3 v: v3

---
 [refs]                   | 2 +-
 trunk/net/core/netpoll.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index dbdf14771faf..9d1a001c21f6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e35ec126507529ce407136c6b9e36747d89891f9
+refs/heads/master: 7d18f114897ff4358419b14d551e704a4299a440
diff --git a/trunk/net/core/netpoll.c b/trunk/net/core/netpoll.c
index 00b14e2c50ed..67b4f3e3d4a5 100644
--- a/trunk/net/core/netpoll.c
+++ b/trunk/net/core/netpoll.c
@@ -138,7 +138,7 @@ static int poll_one_napi(struct netpoll_info *npinfo,
 	set_bit(NAPI_STATE_NPSVC, &napi->state);
 
 	work = napi->poll(napi, budget);
-	trace_napi_poll(napi->dev);
+	trace_napi_poll(napi);
 
 	clear_bit(NAPI_STATE_NPSVC, &napi->state);
 	atomic_dec(&trapped);