From: Anton Vorontsov <avorontsov@ru•mvista.com>
To: Benjamin Herrenschmidt <benh@kernel•crashing.org>
Cc: Sandeep Gopalpet <Sandeep.Kumar@freescale•com>,
netdev@vger•kernel.org,
linuxppc-dev <linuxppc-dev@lists•ozlabs.org>,
David Miller <davem@davemloft•net>
Subject: [PATCH] gianfar: Fix build with CONFIG_NET_POLL_CONTROLLER=y
Date: Wed, 9 Dec 2009 13:44:27 +0300 [thread overview]
Message-ID: <20091209104427.GA25526@oksana.dev.rtsoft.ru> (raw)
In-Reply-To: <1260341804.16132.22.camel@pasglop>
commit 46ceb60ca80fa07703bc6eb8f4651f900dff5a82 ("gianfar: Add
Multiple group Support") introduced the following build error
with CONFIG_NET_POLL_CONTROLLER=y:
CC ggianfar.o
ggianfar.c: In function 'gfar_netpoll':
ggianfar.c:2653: error: invalid storage class for function 'gfar_interrupt'
ggianfar.c:2652: warning: ISO C90 forbids mixed declarations and code
ggianfar.c:2681: error: invalid storage class for function 'adjust_link'
ggianfar.c:2764: error: invalid storage class for function 'gfar_set_multi'
ggianfar.c:2855: error: invalid storage class for function 'gfar_clear_exact_match'
ggianfar.c:2877: error: invalid storage class for function 'gfar_set_hash_for_addr'
ggianfar.c:2898: error: invalid storage class for function 'gfar_set_mac_for_addr'
ggianfar.c:2922: error: invalid storage class for function 'gfar_error'
ggianfar.c:3020: warning: ISO C90 forbids mixed declarations and code
ggianfar.c:3032: error: invalid storage class for function 'gfar_init'
ggianfar.c:3037: error: invalid storage class for function 'gfar_exit'
ggianfar.c:3041: error: initializer element is not constant
ggianfar.c:3042: error: initializer element is not constant
ggianfar.c:3042: warning: ISO C90 forbids mixed declarations and code
ggianfar.c:3042: error: expected declaration or statement at end of input
make[1]: *** [ggianfar.o] Error 1
This patch fixes the issue.
Reported-by: Benjamin Herrenschmidt <benh@kernel•crashing.org>
Signed-off-by: Anton Vorontsov <avorontsov@ru•mvista.com>
---
On Wed, Dec 09, 2009 at 05:56:44PM +1100, Benjamin Herrenschmidt wrote:
> In my next (not pushed out yet as I'm writing this but will be by the
> time you read it hopefully), I get a build failure:
>
> /home/benh/linux-powerpc-test/drivers/net/gianfar.c: In function ‘gfar_netpoll’:
> /home/benh/linux-powerpc-test/drivers/net/gianfar.c:2653: error: invalid storage class for function ‘gfar_interrupt’
[...]
> make[3]: *** [drivers/net/gianfar.o] Error 1
>
> Stephen says that breakage has been in -next for some time...
>
> Can you guys sort it out ?
drivers/net/gianfar.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/drivers/net/gianfar.c b/drivers/net/gianfar.c
index 16def13..6850dc0 100644
--- a/drivers/net/gianfar.c
+++ b/drivers/net/gianfar.c
@@ -2644,6 +2644,7 @@ static void gfar_netpoll(struct net_device *dev)
gfar_interrupt(priv->gfargrp[i].interruptTransmit,
&priv->gfargrp[i]);
enable_irq(priv->gfargrp[i].interruptTransmit);
+ }
}
}
#endif
--
1.6.3.3
next prev parent reply other threads:[~2009-12-09 10:44 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-12-09 6:56 gianfar breaking builds Benjamin Herrenschmidt
2009-12-09 8:50 ` Kumar Gopalpet-B05799
2009-12-09 9:26 ` Benjamin Herrenschmidt
2009-12-09 9:32 ` Kumar Gopalpet-B05799
2009-12-09 9:34 ` Benjamin Herrenschmidt
2009-12-09 10:44 ` Anton Vorontsov [this message]
2009-12-09 10:52 ` [PATCH] gianfar: Fix build with CONFIG_NET_POLL_CONTROLLER=y David Miller
2009-12-09 13:55 ` Kumar Gopalpet-B05799
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=20091209104427.GA25526@oksana.dev.rtsoft.ru \
--to=avorontsov@ru$(echo .)mvista.com \
--cc=Sandeep.Kumar@freescale$(echo .)com \
--cc=benh@kernel$(echo .)crashing.org \
--cc=davem@davemloft$(echo .)net \
--cc=linuxppc-dev@lists$(echo .)ozlabs.org \
--cc=netdev@vger$(echo .)kernel.org \
/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