lkml.org 
[lkml]   [2004]   [Apr]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
SubjectRe: [PATCH 427] Amiga Zorro8390 Ethernet section conflict
On Tue, 13 Apr 2004, Jeff Garzik wrote:
> Geert Uytterhoeven wrote:
> > Zorro8390: const data cannot be in the init data section (from Roman Zippel)
>
> ACK, but this patch highlights a bug:
>
> one is __initdata:
>
> static const struct card_info {
> zorro_id id;
> const char *name;
> unsigned int offset;
> } cards[] __initdata = {
>
> and the lone caller is __devinit:
>
> static int __devinit zorro8390_init_one(struct zorro_dev *z,
> const struct zorro_device_id *ent)

You're right. Here's a fix:

--- linux-2.6.6-rc1/drivers/net/zorro8390.c 2004-04-15 11:44:14.000000000 +0200
+++ linux-m68k-2.6.6-rc1/drivers/net/zorro8390.c 2004-04-15 20:28:54.000000000 +0200
@@ -64,7 +64,7 @@
zorro_id id;
const char *name;
unsigned int offset;
-} cards[] __initdata = {
+} cards[] __devinitdata = {
{ ZORRO_PROD_VILLAGE_TRONIC_ARIADNE2, "Ariadne II", 0x0600 },
{ ZORRO_PROD_INDIVIDUAL_COMPUTERS_X_SURF, "X-Surf", 0x8600 },
};
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 unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

\
 
 \ /
  Last update: 2005-03-22 14:02    [W:0.038 / U:0.980 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site