Re: Linux 2.5.64

Geert Uytterhoeven
2003-03-06T10:29:21Z

On Tue, 4 Mar 2003, Linus Torvalds wrote:
> Christoph Hellwig <hch@sgi.com>:
> o wd33c93 updates

> Dave Jones <davej@codemonkey.org.uk>:
> o wd33c93 sync up with 2.4

These were not compatible. The patch below (untested) fixes the breakage for
sgiwd93:

--- linux-2.5.64/drivers/scsi/wd33c93.c.orig Wed Mar 5 10:07:20 2003
+++ linux-2.5.64/drivers/scsi/wd33c93.c Wed Mar 5 11:56:14 2003
@@ -1471,7 +1471,7 @@
int busycount = 0;
extern void sgiwd93_reset(unsigned long);
/* wait 'til the chip gets some time for us */
- while ((READ_AUX_STAT() & ASR_BSY) && busycount++ < 100)
+ while ((read_aux_stat(regs) & ASR_BSY) && busycount++ < 100)
udelay (10);
/*
* there are scsi devices out there, which manage to lock up
@@ -1481,7 +1481,7 @@
* does this for the SGI Indy, where this is possible
*/
/* still busy ? */
- if (READ_AUX_STAT() & ASR_BSY)
+ if (read_aux_stat(regs) & ASR_BSY)
sgiwd93_reset(instance->base); /* yeah, give it the hard one */
}
#endif

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