2001-03-13 01:19:47

by NeilBrown

[permalink] [raw]
Subject: PATCH - compile fix for 3c509.c in 2.4.3-pre3


Linus,
in 2.4.3-pre3, drivers/net/3c509.c will not compile ifdef CONFIG_ISAPNP.

The following patches fixes the error. I suspect that 3c515.c has
the same problem, but I didn't need to fix that to get my kernel to
build... so I didn't.

NeilBrown



--- ./drivers/net/3c509.c 2001/03/12 00:39:58 1.1
+++ ./drivers/net/3c509.c 2001/03/12 01:31:13 1.2
@@ -327,7 +327,7 @@
irq = idev->irq_resource[0].start;
if (el3_debug > 3)
printk ("ISAPnP reports %s at i/o 0x%x, irq %d\n",
- el3_isapnp_adapters[i].name, ioaddr, irq);
+ (char *)el3_isapnp_adapters[i].driver_data, ioaddr, irq);
EL3WINDOW(0);
for (j = 0; j < 3; j++)
el3_isapnp_phys_addr[pnp_cards][j] =


2001-03-13 01:48:47

by Jeff Garzik

[permalink] [raw]
Subject: Re: PATCH - compile fix for 3c509.c in 2.4.3-pre3

On Tue, 13 Mar 2001, Neil Brown wrote:
> in 2.4.3-pre3, drivers/net/3c509.c will not compile ifdef CONFIG_ISAPNP.
>
> The following patches fixes the error. I suspect that 3c515.c has
> the same problem, but I didn't need to fix that to get my kernel to
> build... so I didn't.

3c509 and 3c515 fixes already sent to him, twice no less :)


2001-03-13 03:03:45

by Jeff Garzik

[permalink] [raw]
Subject: Modular versus non-modular ISAPNP (was Re: PATCH - compile fix for 3c509.c in 2.4.3-pre3)

Neil Brown wrote:
> On Monday March 12, [email protected] wrote:
> > On Tue, 13 Mar 2001, Neil Brown wrote:
> > > in 2.4.3-pre3, drivers/net/3c509.c will not compile ifdef CONFIG_ISAPNP.
> > >
> > > The following patches fixes the error. I suspect that 3c515.c has
> > > the same problem, but I didn't need to fix that to get my kernel to
> > > build... so I didn't.

> > 3c509 and 3c515 fixes already sent to him, twice no less :)

> Drat... I didn't remember seeing it go by on linux-kernel, but maybe I
> didn't pay enough attention.... next time I'll wait till the same
> problem appears in two pre releases before patching...

(re cc'd to lkml...)

My fault on that one, I didn't send it to lkml...

BTW if you noticed, this problem was undetected initially due to
differences between CONFIG_ISAPNP and CONFIG_ISAPNP_MODULE in the
source.

It is highly recommended to always compile with CONFIG_ISAPNP=y due to
these differences. If you grep around for CONFIG_ISAPNP versus
CONFIG_ISAPNP_MODULE, you'll see that many drivers are woefully
unprepared for isapnp support compiled as a module.

--
Jeff Garzik | May you have warm words on a cold evening,
Building 1024 | a full mooon on a dark night,
MandrakeSoft | and a smooth road all the way to your door.

2001-03-13 04:04:16

by Ion Badulescu

[permalink] [raw]
Subject: Re: Modular versus non-modular ISAPNP

On Mon, 12 Mar 2001 22:02:12 -0500, Jeff Garzik <[email protected]> wrote:

> It is highly recommended to always compile with CONFIG_ISAPNP=y due to
> these differences. If you grep around for CONFIG_ISAPNP versus
> CONFIG_ISAPNP_MODULE, you'll see that many drivers are woefully
> unprepared for isapnp support compiled as a module.

Another entry for the Kernel Janitor's List, perhaps?

Ion

--
It is better to keep your mouth shut and be thought a fool,
than to open it and remove all doubt.

2001-03-13 10:05:02

by Jeff Garzik

[permalink] [raw]
Subject: Re: Modular versus non-modular ISAPNP

Ion Badulescu wrote:
>
> On Mon, 12 Mar 2001 22:02:12 -0500, Jeff Garzik <[email protected]> wrote:
>
> > It is highly recommended to always compile with CONFIG_ISAPNP=y due to
> > these differences. If you grep around for CONFIG_ISAPNP versus
> > CONFIG_ISAPNP_MODULE, you'll see that many drivers are woefully
> > unprepared for isapnp support compiled as a module.
>
> Another entry for the Kernel Janitor's List, perhaps?

Yep.. grep for CONFIG_ISAPNP, look at the code, and evaluate it to make
sure that isapnp works for that drivers regardless of whether
CONFIG_ISAPNP -or- CONFIG_ISAPNP_MODULE is defined.

Jeff


--
Jeff Garzik | May you have warm words on a cold evening,
Building 1024 | a full mooon on a dark night,
MandrakeSoft | and a smooth road all the way to your door.