Re: linux-next: Tree for May 14

Previous thread: [PATCH 2/3] sysfs: remove error messages for -EEXIST case by Stephen Hemminger on Wednesday, May 14, 2008 - 9:16 pm. (17 messages)

Next thread: [patch][rfc] ccid: fix memory ordering in locking by Nick Piggin on Wednesday, May 14, 2008 - 10:19 pm. (1 message)
To: Randy Dunlap <randy.dunlap@...>
Cc: Geert Uytterhoeven <geert@...>, Stephen Rothwell <sfr@...>, <linux-next@...>, LKML <linux-kernel@...>, Jeff Garzik <jgarzik@...>, David Miller <davem@...>, <netdev@...>
Date: Wednesday, May 14, 2008 - 9:05 pm

FWIW the error in question is:
Using /scratch1/tony/next as source for kernel
GEN /scratch1/tony/next_out/Makefile
CHK include/linux/version.h
CHK include/linux/utsrelease.h
CALL /scratch1/tony/next/scripts/checksyscalls.sh
CHK include/linux/compile.h
CC [M] drivers/net/zorro8390.o
In file included from /scratch1/tony/next/drivers/net/zorro8390.c:47:
/scratch1/tony/next/drivers/net/lib8390.c: In function 'ei_tx_err':
/scratch1/tony/next/drivers/net/lib8390.c:556: error: 'ei_local' undeclared (first use in this function)
/scratch1/tony/next/drivers/net/lib8390.c:556: error: (Each undeclared identifier is reported only once
/scratch1/tony/next/drivers/net/lib8390.c:556: error: for each function it appears in.)
/scratch1/tony/next/drivers/net/lib8390.c: In function 'ei_rx_overrun':
/scratch1/tony/next/drivers/net/lib8390.c:823: error: 'ei_local' undeclared (first use in this function)
make[3]: *** [drivers/net/zorro8390.o] Error 1
make[2]: *** [drivers/net] Error 2
make[1]: *** [drivers] Error 2
make: *** [sub-make] Error 2

It was introduced by 3f8cb098859bbea29d7b3765a3102e4a6bf81b85
(drivers/net/lib8390: fix warning, trim trailing whitespace)

The problem is that ei_inb_p() is using various #defines (from
drivers/net/8390.h) that use EI_SHIFT, which in the zorro8390 case uses
ei_local. Since zorro8390 is only build for m68k, guard the definition of
ei_local with CONFIG_M68K

The patch below fixes the zorro8390 build, and I think will keep the warnings
that Jeff is trying to silence silenced.

Signed-off-by: Tony Breeds <tony@bakeyournoodle.com>

---

drivers/net/lib8390.c | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/drivers/net/lib8390.c b/drivers/net/lib8390.c
index ed49527..a3d04a1 100644
--- a/drivers/net/lib8390.c
+++ b/drivers/net/lib8390.c
@@ -553,6 +553,9 @@ static void __ei_poll(struct net_device *dev)
static void ei_tx_err(struct net_device *dev)
{
unsigned long e8390_base = dev-&...

To: Tony Breeds <tony@...>
Cc: Randy Dunlap <randy.dunlap@...>, Stephen Rothwell <sfr@...>, <linux-next@...>, LKML <linux-kernel@...>, Jeff Garzik <jgarzik@...>, David Miller <davem@...>, <netdev@...>, Linux/m68k <linux-m68k@...>
Date: Thursday, May 15, 2008 - 3:17 am

Technically, it could also happen on PPC (APUS), but all APUS support got
removed a few months ago.
So maybe CONFIG_ZORRO is more appropriate?

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
--

To: Geert Uytterhoeven <geert@...>
Cc: Randy Dunlap <randy.dunlap@...>, Stephen Rothwell <sfr@...>, <linux-next@...>, LKML <linux-kernel@...>, Jeff Garzik <jgarzik@...>, David Miller <davem@...>, <netdev@...>, Linux/m68k <linux-m68k@...>
Date: Thursday, May 15, 2008 - 10:10 pm

Well as it turns out it can happen in a few other plcaes (the same error
is visible on sh aswell:
http://kisskb.ellerman.id.au/kisskb/buildresult/27769/ )

Below is a new fix. Thoughts?.

From: Tony Breeds <tony@bakeyournoodle.com>
Subject: [PATCH] Fix various 8390 builds

The commit 3f8cb098859bbea29d7b3765a3102e4a6bf81b85
(drivers/net/lib8390: fix warning, trim trailing whitespace) removed
ei_local from ei_tx_err() and ei_rx_overrun() resulting in the following
build errors on m68k and sh:

Using /scratch1/tony/next as source for kernel
GEN /scratch1/tony/next_out/Makefile
CHK include/linux/version.h
CHK include/linux/utsrelease.h
CALL /scratch1/tony/next/scripts/checksyscalls.sh
CHK include/linux/compile.h
CC [M] drivers/net/zorro8390.o
In file included from /scratch1/tony/next/drivers/net/zorro8390.c:47:
drivers/net/lib8390.c: In function 'ei_tx_err':
drivers/net/lib8390.c:556: error: 'ei_local' undeclared (first use in this function)
drivers/net/lib8390.c:556: error: (Each undeclared identifier is reported only once
drivers/net/lib8390.c:556: error: for each function it appears in.)
drivers/net/lib8390.c: In function 'ei_rx_overrun':
drivers/net/lib8390.c:823: error: 'ei_local' undeclared (first use in this function)
make[3]: *** [drivers/net/zorro8390.o] Error 1
make[2]: *** [drivers/net] Error 2
make[1]: *** [drivers] Error 2
make: *** [sub-make] Error 2

The problem is that ei_inb_p() is using various #defines (from
drivers/net/8390.h) that use EI_SHIFT, which in some drivers on some
architectures use ei_local. Tag ei_local as "__maybe_unused" to keep it
around and keep the warnings the original commit is trying to silence
... silenced.

Signed-off-by: Tony Breeds <tony@bakeyournoodle.com>
---
drivers/net/lib8390.c | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/drivers/net/lib8390.c b/drivers/net/lib8390.c
index ed49527..fb00268 100644
--- a/drivers/net/lib8390.c
+++ b/drive...

To: Tony Breeds <tony@...>
Cc: Randy Dunlap <randy.dunlap@...>, Stephen Rothwell <sfr@...>, <linux-next@...>, LKML <linux-kernel@...>, Jeff Garzik <jgarzik@...>, David Miller <davem@...>, <netdev@...>, Linux/m68k <linux-m68k@...>
Date: Friday, May 16, 2008 - 3:12 am

^^^^^^^^^^^^^^^^^^^^
^^^^^^^^^^^^^^^^^^^^
Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
--

To: David Miller <davem@...>, Jeff Garzik <jgarzik@...>, Stephen Rothwell <sfr@...>
Cc: Geert Uytterhoeven <geert@...>, Randy Dunlap <randy.dunlap@...>, <linux-next@...>, LKML <linux-kernel@...>, <netdev@...>, Linux/m68k <linux-m68k@...>
Date: Monday, May 19, 2008 - 1:03 am

The commit 3f8cb098859bbea29d7b3765a3102e4a6bf81b85
(drivers/net/lib8390: fix warning, trim trailing whitespace) removed
ei_local from ei_tx_err() and ei_rx_overrun() resulting in the following
build errors on m68k and sh:

Using /scratch1/tony/next as source for kernel
GEN /scratch1/tony/next_out/Makefile
CHK include/linux/version.h
CHK include/linux/utsrelease.h
CALL /scratch1/tony/next/scripts/checksyscalls.sh
CHK include/linux/compile.h
CC [M] drivers/net/zorro8390.o
In file included from /scratch1/tony/next/drivers/net/zorro8390.c:47:
drivers/net/lib8390.c: In function 'ei_tx_err':
drivers/net/lib8390.c:556: error: 'ei_local' undeclared (first use in this function)
drivers/net/lib8390.c:556: error: (Each undeclared identifier is reported only once
drivers/net/lib8390.c:556: error: for each function it appears in.)
drivers/net/lib8390.c: In function 'ei_rx_overrun':
drivers/net/lib8390.c:823: error: 'ei_local' undeclared (first use in this function)
make[3]: *** [drivers/net/zorro8390.o] Error 1
make[2]: *** [drivers/net] Error 2
make[1]: *** [drivers] Error 2
make: *** [sub-make] Error 2

The problem is that ei_inb_p() is using various #defines (from
drivers/net/8390.h) that use EI_SHIFT, which in some drivers on some
architectures use ei_local. Tag ei_local as "__maybe_unused" to keep it
around and keep the warnings the original commit is trying to silence
... silenced.

Signed-off-by: Tony Breeds <tony@bakeyournoodle.com>
---
Updated to remove pointless casts

drivers/net/lib8390.c | 4 ++++
1 file changed, 4 insertions(+)

Dave, Jeff can one of you take this?

diff --git a/drivers/net/lib8390.c b/drivers/net/lib8390.c
index ed49527..00d59ab 100644
--- a/drivers/net/lib8390.c
+++ b/drivers/net/lib8390.c
@@ -553,6 +553,8 @@ static void __ei_poll(struct net_device *dev)
static void ei_tx_err(struct net_device *dev)
{
unsigned long e8390_base = dev->base_addr;
+ /* ei_local is used on some platforms via the EI_SHIFT macro ...

To: Geert Uytterhoeven <geert@...>
Cc: Tony Breeds <tony@...>, Randy Dunlap <randy.dunlap@...>, <linux-next@...>, LKML <linux-kernel@...>, Jeff Garzik <jgarzik@...>, David Miller <davem@...>, <netdev@...>, Linux/m68k <linux-m68k@...>
Date: Thursday, May 15, 2008 - 3:23 am

Hi Geert,

On Thu, 15 May 2008 09:17:15 +0200 (CEST) Geert Uytterhoeven <geert@linux-m=

No, he didn't. He reran the build by hand. Sorry, but there appears to
a bug somewhere in our build system (or one of the tools it is using)
that very occasionally loses a line of the log. We are trying to track

I have applied this patch to today's linux-next, so that this particular
bug will not prevent the m68k builds. I am hoping someone will pick it
up (or an equivalent patch) so I can drop it again.

--=20
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

Previous thread: [PATCH 2/3] sysfs: remove error messages for -EEXIST case by Stephen Hemminger on Wednesday, May 14, 2008 - 9:16 pm. (17 messages)

Next thread: [patch][rfc] ccid: fix memory ordering in locking by Nick Piggin on Wednesday, May 14, 2008 - 10:19 pm. (1 message)