PATCH: fdomain.c broken in 2.1.96

C. Scott Ananian (cananian@lcs.mit.edu)
Wed, 15 Apr 1998 17:15:19 -0400 (EDT)


The drivers/scsi/fdomain.c modules was 'fixed' in 2.1.96 to add proper SMP
locking, but the fixer forgot to check to see if the fixed module still
compiled. It doesn't. The attached patch fixes it.

This will get pcmcia-cs (which uses the code in fdomain.c) compiling
again, too. [pcmcia-cs users, email me for a patch to pcmcia-cs.02-Apr-98
to get rid of the #warnings related to the new pci interface in 2.1.93]

Linus, please apply this for 2.1.97, or forward it to whoever touched
fdomain.c in 2.1.96.
--Scott
@ @
=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-oOO-(_)-OOo-=-=-=-=-=
C. Scott Ananian: cananian@lcs.mit.edu / Declare the Truth boldly and
Laboratory for Computer Science/Crypto / without hindrance.
Massachusetts Institute of Technology /META-PARRESIAS AKOLUTOS:Acts 28:31
-.-. .-.. .. ..-. ..-. --- .-. -.. ... -.-. --- - - .- -. .- -. .. .- -.
PGP key available via finger and from http://www.pdos.lcs.mit.edu/~cananian

diff -ruHp -X badboys linux-orig/drivers/scsi/fdomain.c linux-2.1.96/drivers/scsi/fdomain.c
--- linux-orig/drivers/scsi/fdomain.c Wed Apr 15 15:23:27 1998
+++ linux-2.1.96/drivers/scsi/fdomain.c Wed Apr 15 15:18:29 1998
@@ -402,6 +402,8 @@ static int FIFO_Size = 0x2

extern void fdomain_16x0_intr( int irq, void *dev_id,
struct pt_regs * regs );
+static void do_fdomain_16x0_intr( int irq, void *dev_id,
+ struct pt_regs * regs );

static unsigned long addresses[] = {
0xc8000,
@@ -1611,7 +1613,8 @@ void fdomain_16x0_intr( int irq, void *d
return;
}

-void do_fdomain_16x0_intr( int irq, void *dev_id, struct pt_regs * regs )
+static void
+do_fdomain_16x0_intr( int irq, void *dev_id, struct pt_regs * regs )
{
unsigned long flags;

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.rutgers.edu