--- /Linux/my_code/my_kernel_patches/__scsi.diff Tue Jan 29 05:14:39 2002 +++ /Linux/my_code/my_kernel_patches/scsi.diff Tue Jan 29 05:09:06 2002 @@ -1,5 +1,3 @@ -Only in ./drivers/scsi/: .depend -Only in ./drivers/scsi/: .hosts.c.swp diff -ur ./drivers/scsi/3w-xxxx.c ./drivers/scsi/3w-xxxx.c --- ./drivers/scsi/3w-xxxx.c Mon Jan 28 13:45:33 2002 +++ ./drivers/scsi/3w-xxxx.c Mon Jan 28 13:47:33 2002 @@ -55,7 +53,6 @@ spin_lock(&tw_dev->tw_lock); tw_dev->num_resets++; -Only in ./drivers/scsi/: 3w-xxxx.c~ diff -ur ./drivers/scsi/53c7,8xx.c ./drivers/scsi/53c7,8xx.c --- ./drivers/scsi/53c7,8xx.c Mon Jan 28 13:45:33 2002 +++ ./drivers/scsi/53c7,8xx.c Mon Jan 28 13:28:17 2002 @@ -477,7 +474,6 @@ } int aha1740_queuecommand(Scsi_Cmnd * SCpnt, void (*done)(Scsi_Cmnd *)) -Only in ./drivers/scsi/aic7xxx: .depend diff -ur ./drivers/scsi/atp870u.c ./drivers/scsi/atp870u.c --- ./drivers/scsi/atp870u.c Mon Jan 28 13:45:33 2002 +++ ./drivers/scsi/atp870u.c Mon Jan 28 13:36:46 2002 @@ -1035,10 +1031,10 @@ -#define GDTH_UNLOCK_SCSI_DONE(flags) spin_unlock_irqrestore(&io_request_lock,flags) -#define GDTH_LOCK_SCSI_DOCMD() spin_lock_irq(&io_request_lock) -#define GDTH_UNLOCK_SCSI_DOCMD() spin_unlock_irq(&io_request_lock) -+#define GDTH_LOCK_SCSI_DONE(dev, flags) spin_lock_irqsave(((struct Scsi_Host *)dev->host_lock),flags) -+#define GDTH_UNLOCK_SCSI_DONE(flags) spin_unlock_irqrestore(((struct Scsi_Host *)dev->host_lock),flags) -+#define GDTH_LOCK_SCSI_DOCMD(dev) spin_lock_irq(((struct Scsi_Host *)dev->host_lock)) -+#define GDTH_UNLOCK_SCSI_DOCMD(dev) spin_unlock_irq(((struct Scsi_Host *)dev->host_lock)) ++#define GDTH_LOCK_SCSI_DONE(dev, flags) spin_lock_irqsave(dev->host_lock,flags) ++#define GDTH_UNLOCK_SCSI_DONE(flags) spin_unlock_irqrestore(dev->host_lock,flags) ++#define GDTH_LOCK_SCSI_DOCMD(dev) spin_lock_irq(dev->host_lock) ++#define GDTH_UNLOCK_SCSI_DOCMD(dev) spin_unlock_irq(dev->host_lock) #else #define GDTH_INIT_LOCK_HA(ha) do {} while (0) #define GDTH_LOCK_HA(ha,flags) do {save_flags(flags); cli();} while (0) @@ -1091,8 +1087,8 @@ -#define IBMLOCK spin_lock_irqsave(&io_request_lock, flags); -#define IBMUNLOCK spin_unlock_irqrestore(&io_request_lock, flags); -+#define IBMLOCK(dev) spin_lock_irqsave(((struct Scsi_Host *)dev)->host_lock, flags); -+#define IBMUNLOCK(dev) spin_unlock_irqrestore(((struct Scsi_Host *)dev)->host_lock, flags); ++#define IBMLOCK(dev) spin_lock_irqsave(dev->host_lock, flags); ++#define IBMUNLOCK(dev) spin_unlock_irqrestore(dev->host_lock, flags); /* driver configuration */ #define IM_MAX_HOSTS 8 /* maximum number of host adapters */ @@ -1783,10 +1779,10 @@ -#define IO_UNLOCK(host) spin_unlock_irqrestore(&(host)->host_lock,io_flags) -#define IO_LOCK_IRQ(host) spin_lock_irq(&(host)->host_lock) -#define IO_UNLOCK_IRQ(host) spin_unlock_irq(&(host)->host_lock) -+#define IO_LOCK(host) spin_lock_irqsave((host)->host_lock,io_flags) -+#define IO_UNLOCK(host) spin_unlock_irqrestore((host)->host_lock,io_flags) -+#define IO_LOCK_IRQ(host) spin_lock_irq((host)->host_lock) -+#define IO_UNLOCK_IRQ(host) spin_unlock_irq((host)->host_lock) ++#define IO_LOCK(host) spin_lock_irqsave(host->host_lock,io_flags) ++#define IO_UNLOCK(host) spin_unlock_irqrestore(host->host_lock,io_flags) ++#define IO_LOCK_IRQ(host) spin_lock_irq(host->host_lock) ++#define IO_UNLOCK_IRQ(host) spin_unlock_irq(host->host_lock) #define queue_task_irq(a,b) queue_task(a,b) #define queue_task_irq_off(a,b) queue_task(a,b) @@ -1931,7 +1927,6 @@ out:; } /**************************************************************** -Only in ./drivers/scsi/pcmcia: .depend diff -ur ./drivers/scsi/ppa.c ./drivers/scsi/ppa.c --- ./drivers/scsi/ppa.c Mon Jan 28 13:45:34 2002 +++ ./drivers/scsi/ppa.c Mon Jan 28 13:29:22 2002 @@ -2252,7 +2247,6 @@ { restore_flags(flags); printk(KERN_ERR "sym53c416: Unable to assign IRQ %d\n", hosts[i].irq); -Only in ./drivers/scsi/sym53c8xx_2: .depend diff -ur ./drivers/scsi/sym53c8xx_comm.h ./drivers/scsi/sym53c8xx_comm.h --- ./drivers/scsi/sym53c8xx_comm.h Mon Jan 28 13:45:34 2002 +++ ./drivers/scsi/sym53c8xx_comm.h Mon Jan 28 13:41:44 2002