Re: 2.5.74: aha1740.c doesn't compile

Marc Zyngier (mzyngier@freesurf.fr)
Thu, 03 Jul 2003 17:16:51 +0200


>>>>> "Adrian" == Adrian Bunk <bunk@fs.tum.de> writes:

Adrian> On Thu, Jul 03, 2003 at 02:03:38PM +0200, Marc Zyngier wrote:
>> >>>>> "Adrian" == Adrian Bunk <bunk@fs.tum.de> writes:
>>
Adrian> drivers/scsi/aha1740.c fails to build on 2.5.74 withthe
Adrian> following error:
>>
>> Weird error.
>>
>> Compiles just fine here... Please send your .config.

Adrian> It's attached.

Ok, paper bag, please. I should _really_ use DEBUG_SPINLOCK...

James, please apply.

M.

--- linux-2.5/drivers/scsi/aha1740.c 2003-07-01 18:51:30.000000000 +0200
+++ linux-2.5.74/drivers/scsi/aha1740.c 2003-07-03 17:12:31.000000000 +0200
@@ -375,7 +375,7 @@
#endif

/* locate an available ecb */
- spin_lock_irqsave(&SCpnt->device->host->host_lock, flags);
+ spin_lock_irqsave(SCpnt->device->host->host_lock, flags);
ecbno = host->last_ecb_used + 1; /* An optimization */
if (ecbno >= AHA1740_ECBS)
ecbno = 0;
@@ -394,7 +394,7 @@
doubles as reserved flag */

host->last_ecb_used = ecbno;
- spin_unlock_irqrestore(&SCpnt->device->host->host_lock, flags);
+ spin_unlock_irqrestore(SCpnt->device->host->host_lock, flags);

#ifdef DEBUG
printk("Sending command (%d %x)...", ecbno, done);
@@ -491,7 +491,7 @@
unsigned int base = SCpnt->device->host->io_port;
DEB(printk("aha1740[%d] critical section\n",ecbno));

- spin_lock_irqsave(&SCpnt->device->host->host_lock, flags);
+ spin_lock_irqsave(SCpnt->device->host->host_lock, flags);
for (loopcnt = 0; ; loopcnt++) {
if (inb(G2STAT(base)) & G2STAT_MBXOUT) break;
if (loopcnt == LOOPCNT_WARN) {
@@ -511,7 +511,7 @@
panic("aha1740.c: attn wait failed!\n");
}
outb(ATTN_START | (target & 7), ATTN(base)); /* Start it up */
- spin_unlock_irqrestore(&SCpnt->device->host->host_lock, flags);
+ spin_unlock_irqrestore(SCpnt->device->host->host_lock, flags);
DEB(printk("aha1740[%d] request queued.\n",ecbno));
} else
printk(KERN_ALERT "aha1740_queuecommand: done can't be NULL\n");

-- 
Places change, faces change. Life is so very strange.
-
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/