Messages in this thread Patch in this message | | | Date | Sat, 22 Mar 2003 09:23:30 +0100 | From | Adrian Bunk <> | Subject | Re: 2.5.64-ac3: 3c527.c doesn't compile |
| |
On Fri, Mar 07, 2003 at 03:34:52PM -0600, James Bottomley wrote: > On Fri, 2003-03-07 at 15:03, Adrian Bunk wrote: > > On Fri, Mar 07, 2003 at 12:56:44PM -0500, Alan Cox wrote: > > > > >... > > > Linux 2.5.64-ac2 > > >... > > > o Update 3c527 to modern locking (untested) (James Bottomley) > > >... > > > > It seems even the compilation is untested? > > It builds for me fine in 2.5.64. Perhaps you misapplied the patch, or > got a mangled one. The correct patch is below.
The patch in your mail was empty.
The problem is still present in 2.5.65-ac2, is the patch below correct?
> James
cu Adrian
--- linux-2.5.65-ac2/drivers/net/3c527.c.old 2003-03-22 09:19:39.000000000 +0100 +++ linux-2.5.65-ac2/drivers/net/3c527.c 2003-03-22 09:20:44.000000000 +0100 @@ -624,7 +624,8 @@ struct mc32_local *lp = (struct mc32_local *)dev->priv; int ioaddr = dev->base_addr; int ret = 0; - + unsigned long flags; + /* * Wait for a command */ @@ -729,6 +730,7 @@ { struct mc32_local *lp = (struct mc32_local *)dev->priv; int ioaddr = dev->base_addr; + unsigned long flags; spin_lock_irqsave(&lp->lock, flags); @@ -948,7 +950,7 @@ u8 one=1; u8 regs; u16 descnumbuffs[2] = {TX_RING_LEN, RX_RING_LEN}; - unsigned_long flags; + unsigned long flags; spin_lock_irqsave(&lp->lock, flags); - 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/
| |