From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755095AbZEVGav (ORCPT ); Fri, 22 May 2009 02:30:51 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751122AbZEVGak (ORCPT ); Fri, 22 May 2009 02:30:40 -0400 Received: from 74-93-104-97-Washington.hfc.comcastbusiness.net ([74.93.104.97]:57163 "EHLO sunset.davemloft.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750880AbZEVGak (ORCPT ); Fri, 22 May 2009 02:30:40 -0400 Date: Thu, 21 May 2009 23:30:38 -0700 (PDT) Message-Id: <20090521.233038.195647453.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 From: David Miller In-Reply-To: <20090522151642.e79e22ee.sfr@canb.auug.org.au> References: <20090522151642.e79e22ee.sfr@canb.auug.org.au> X-Mailer: Mew version 6.2.51 on Emacs 22.1 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Stephen Rothwell 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 --- 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