M68k wd33c93: host_lock is a pointer to a spinlock, not a spinlock (from Ralf
Bächle)
--- linux-2.6.x/drivers/scsi/a2091.c Fri May 9 10:21:34 2003
+++ linux-m68k-2.6.x/drivers/scsi/a2091.c Fri Jun 6 13:33:13 2003
@@ -43,9 +43,9 @@
continue;
if (status & ISTR_INTS) {
- spin_lock_irqsave(&instance->host_lock, flags);
+ spin_lock_irqsave(instance->host_lock, flags);
wd33c93_intr (instance);
- spin_unlock_irqrestore(&instance->host_lock, flags);
+ spin_unlock_irqrestore(instance->host_lock, flags);
handled = 1;
}
}
--- linux-2.6.x/drivers/scsi/a3000.c Fri May 9 10:21:34 2003
+++ linux-m68k-2.6.x/drivers/scsi/a3000.c Fri Jun 6 13:33:13 2003
@@ -36,9 +36,9 @@
return IRQ_NONE;
if (status & ISTR_INTS)
{
- spin_lock_irqsave(&a3000_host->host_lock, flags);
+ spin_lock_irqsave(a3000_host->host_lock, flags);
wd33c93_intr (a3000_host);
- spin_unlock_irqrestore(&a3000_host->host_lock, flags);
+ spin_unlock_irqrestore(a3000_host->host_lock, flags);
return IRQ_HANDLED;
}
printk("Non-serviced A3000 SCSI-interrupt? ISTR = %02x\n", status);
--- linux-2.6.x/drivers/scsi/gvp11.c Fri May 9 10:21:34 2003
+++ linux-m68k-2.6.x/drivers/scsi/gvp11.c Fri Jun 6 13:33:18 2003
@@ -42,9 +42,9 @@
if (!(status & GVP11_DMAC_INT_PENDING))
continue;
- spin_lock_irqsave(&instance->host_lock, flags);
+ spin_lock_irqsave(instance->host_lock, flags);
wd33c93_intr (instance);
- spin_unlock_irqrestore(&instance->host_lock, flags);
+ spin_unlock_irqrestore(instance->host_lock, flags);
handled = 1;
}
return IRQ_RETVAL(handled);
Gr{oetje,eeting}s,
Geert
-- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.orgIn 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/
This archive was generated by hypermail 2b29 : Thu Jul 31 2003 - 22:00:28 EST