From: David Miller <davem@davemloft•net>
To: sfr@canb•auug.org.au
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
nhorman@tuxdriver•com, netdev@vger•kernel.org
Subject: Re: linux-next: net tree build warning
Date: Thu, 21 May 2009 23:30:38 -0700 (PDT) [thread overview]
Message-ID: <20090521.233038.195647453.davem@davemloft.net> (raw)
In-Reply-To: <20090522151642.e79e22ee.sfr@canb.auug.org.au>
From: Stephen Rothwell <sfr@canb•auug.org.au>
Date: Fri, 22 May 2009 15:16:42 +1000
> Hi Dave,
>
> Today's linux-next build (powerpc ppc64_defconfig) produced this warning:
>
> net/core/netpoll.c: In function 'poll_one_napi':
> net/core/netpoll.c:141: warning: passing argument 1 of 'trace_napi_poll' from incompatible pointer type
> include/trace/napi.h:7: note: expected 'struct napi_struct *' but argument is of type 'struct net_device *'
>
> Introduced by commit 4ea7e38696c7e798c47ebbecadfd392f23f814f9 ("dropmon:
> add ability to detect when hardware dropsrxpackets").
I just pushed the following to fix this:
net: Fix arg to trace_napi_poll() in netpoll.
Reproted by Stephen Rothwell.
Signed-off-by: David S. Miller <davem@davemloft•net>
---
net/core/netpoll.c | 2 +-
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);
--
1.6.3
next prev parent reply other threads:[~2009-05-22 6:30 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-05-22 5:16 linux-next: net tree build warning Stephen Rothwell
2009-05-22 6:30 ` David Miller [this message]
2009-05-22 8:20 ` Stephen Rothwell
2009-05-22 10:31 ` Neil Horman
-- strict thread matches above, loose matches on Subject: below --
2009-11-30 5:40 Stephen Rothwell
2009-11-30 9:49 ` Andrei Pelinescu-Onciul
2009-11-12 2:24 Stephen Rothwell
2009-11-12 2:53 ` David Miller
2009-11-12 2:55 ` Eric Dumazet
2009-11-12 3:10 ` Stephen Rothwell
2009-11-05 2:30 Stephen Rothwell
[not found] <20090904144232.1f6ccf45.sfr@canb.auug.org.au>
2009-09-07 9:04 ` David Miller
2009-09-07 9:37 ` Stephen Rothwell
2009-09-04 4:28 Stephen Rothwell
2009-09-04 4:35 ` David Miller
2009-06-09 10:36 Stephen Rothwell
2009-06-09 11:25 ` Wolfgang Grandegger
2009-06-09 11:26 ` David Miller
2009-06-09 13:14 ` Wolfgang Grandegger
2009-06-10 0:38 ` David Miller
2009-06-10 7:38 ` Wolfgang Grandegger
2009-06-10 8:12 ` David Miller
2009-03-12 5:58 Stephen Rothwell
2009-03-12 6:24 ` David Miller
2009-03-12 6:42 ` Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20090521.233038.195647453.davem@davemloft.net \
--to=davem@davemloft$(echo .)net \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=netdev@vger$(echo .)kernel.org \
--cc=nhorman@tuxdriver$(echo .)com \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox