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/esp.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/esp.c')
| -rw-r--r-- | drivers/scsi/esp.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/drivers/scsi/esp.c b/drivers/scsi/esp.c index 596e7b33f..d6059c153 100644 --- a/drivers/scsi/esp.c +++ b/drivers/scsi/esp.c @@ -39,6 +39,7 @@ #include <asm/idprom.h> #endif +#include <asm/spinlock.h> #include <asm/system.h> #include <asm/ptrace.h> #include <asm/pgtable.h> @@ -90,6 +91,7 @@ struct Sparc_ESP *espchain = 0; int nesps = 0, esps_in_use = 0, esps_running = 0; void esp_intr(int irq, void *dev_id, struct pt_regs *pregs); +static void do_esp_intr(int irq, void *dev_id, struct pt_regs *pregs); /* Debugging routines */ struct esp_cmdstrings { @@ -3607,6 +3609,15 @@ esp_handle_done: return; } +static void do_esp_intr(int irq, void *dev_id, struct pt_regs *pregs) +{ + unsigned long flags; + + spin_lock_irqsave(&io_request_lock, flags); + esp_intr(irq, dev_id, pregs); + spin_unlock_irqrestore(&io_request_lock, flags); +} + #ifndef __sparc_v9__ #ifndef __SMP__ |