aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2009-05-21 23:30:09 -0700
committerDavid S. Miller <davem@davemloft.net>2009-05-21 23:30:09 -0700
commit7d18f114897ff4358419b14d551e704a4299a440 (patch)
tree33a0aa550b34d46f7c4ff025c3b8b0aa7e2c2f99 /net
parente35ec126507529ce407136c6b9e36747d89891f9 (diff)
downloadkernel_samsung_crespo-7d18f114897ff4358419b14d551e704a4299a440.zip
kernel_samsung_crespo-7d18f114897ff4358419b14d551e704a4299a440.tar.gz
kernel_samsung_crespo-7d18f114897ff4358419b14d551e704a4299a440.tar.bz2
net: Fix arg to trace_napi_poll() in netpoll.
Reproted by Stephen Rothwell. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/core/netpoll.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/core/netpoll.c b/net/core/netpoll.c
index 00b14e2..67b4f3e 100644
--- a/net/core/netpoll.c
+++ b/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);