* [PATCH 427] Amiga Zorro8390 Ethernet section conflict
@ 2004-04-13 8:38 Geert Uytterhoeven
2004-04-13 16:35 ` Jeff Garzik
0 siblings, 1 reply; 3+ messages in thread
From: Geert Uytterhoeven @ 2004-04-13 8:38 UTC (permalink / raw)
To: Linus Torvalds, Andrew Morton
Cc: Linux Kernel Development, Geert Uytterhoeven
Zorro8390: const data cannot be in the init data section (from Roman Zippel)
--- linux-2.6.5-rc2/drivers/net/zorro8390.c 19 Feb 2004 20:14:19 -0000 1.7
+++ linux-m68k-2.6.5-rc2/drivers/net/zorro8390.c 26 Mar 2004 21:47:26 -0000
@@ -60,7 +60,7 @@
#define WORDSWAP(a) ((((a)>>8)&0xff) | ((a)<<8))
-static const struct card_info {
+static struct card_info {
zorro_id id;
const char *name;
unsigned int offset;
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
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH 427] Amiga Zorro8390 Ethernet section conflict
2004-04-13 8:38 [PATCH 427] Amiga Zorro8390 Ethernet section conflict Geert Uytterhoeven
@ 2004-04-13 16:35 ` Jeff Garzik
2004-04-15 18:39 ` Geert Uytterhoeven
0 siblings, 1 reply; 3+ messages in thread
From: Jeff Garzik @ 2004-04-13 16:35 UTC (permalink / raw)
To: Geert Uytterhoeven
Cc: Linus Torvalds, Andrew Morton, Linux Kernel Development
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)
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH 427] Amiga Zorro8390 Ethernet section conflict
2004-04-13 16:35 ` Jeff Garzik
@ 2004-04-15 18:39 ` Geert Uytterhoeven
0 siblings, 0 replies; 3+ messages in thread
From: Geert Uytterhoeven @ 2004-04-15 18:39 UTC (permalink / raw)
To: Jeff Garzik; +Cc: Linus Torvalds, Andrew Morton, Linux Kernel Development
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
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2004-04-15 18:45 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2004-04-13 8:38 [PATCH 427] Amiga Zorro8390 Ethernet section conflict Geert Uytterhoeven
2004-04-13 16:35 ` Jeff Garzik
2004-04-15 18:39 ` Geert Uytterhoeven
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox