diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1998-05-07 02:55:41 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1998-05-07 02:55:41 +0000 |
| commit | dcec8a13bf565e47942a1751a9cec21bec5648fe (patch) | |
| tree | 548b69625b18cc2e88c3e68d0923be546c9ebb03 /drivers/scsi/sgiwd93.c | |
| parent | 2e0f55e79c49509b7ff70ff1a10e1e9e90a3dfd4 (diff) | |
o Merge with Linux 2.1.99.
o Fix ancient bug in the ELF loader making ldd crash.
o Fix ancient bug in the keyboard code for SGI, SNI and Jazz.
Diffstat (limited to 'drivers/scsi/sgiwd93.c')
| -rw-r--r-- | drivers/scsi/sgiwd93.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/scsi/sgiwd93.c b/drivers/scsi/sgiwd93.c index afd9fd6a9..d618bd54d 100644 --- a/drivers/scsi/sgiwd93.c +++ b/drivers/scsi/sgiwd93.c @@ -5,7 +5,7 @@ * * (In all truth, Jed Schimmel wrote all this code.) * - * $Id: sgiwd93.c,v 1.7 1996/07/23 09:00:16 dm Exp $ + * $Id: sgiwd93.c,v 1.6 1998/04/05 11:24:32 ralf Exp $ */ #include <linux/init.h> #include <linux/types.h> @@ -21,6 +21,7 @@ #include <asm/sgihpc.h> #include <asm/sgint23.h> #include <asm/irq.h> +#include <asm/spinlock.h> #include <asm/io.h> #include "scsi.h" @@ -65,7 +66,11 @@ static inline unsigned long read_wd33c93_count(wd33c93_regs *regp) /* XXX woof! */ static void sgiwd93_intr(int irq, void *dev_id, struct pt_regs *regs) { + unsigned long flags; + + spin_lock_irqsave(&io_request_lock, flags); wd33c93_intr(sgiwd93_host); + spin_unlock_irqrestore(&io_request_lock, flags); } #undef DEBUG_DMA |