diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-07-05 23:09:37 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-07-05 23:09:37 +0000 |
| commit | aba344fdfed81b2c03d6114c54cfd73a486aa10b (patch) | |
| tree | d032d8430bf1234c3ecc6f6330d6de6e887e5963 /drivers/scsi | |
| parent | 40c138bfc6d37dbff5339f84575db1e3cec6e34e (diff) | |
Merge with Linux 2.3.9.
Diffstat (limited to 'drivers/scsi')
| -rw-r--r-- | drivers/scsi/aic7xxx_proc.c | 2 | ||||
| -rw-r--r-- | drivers/scsi/sd.c | 2 | ||||
| -rw-r--r-- | drivers/scsi/st.c | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/drivers/scsi/aic7xxx_proc.c b/drivers/scsi/aic7xxx_proc.c index 3314514f4..a986c5e80 100644 --- a/drivers/scsi/aic7xxx_proc.c +++ b/drivers/scsi/aic7xxx_proc.c @@ -29,6 +29,8 @@ * $Id: aic7xxx_proc.c,v 4.1 1997/06/97 08:23:42 deang Exp $ *-M*************************************************************************/ +#include <linux/config.h> + #define BLS (&aic7xxx_buffer[size]) #define HDRB \ " < 2K 2K+ 4K+ 8K+ 16K+ 32K+ 64K+ 128K+" diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c index e89eeecb7..22ab35f63 100644 --- a/drivers/scsi/sd.c +++ b/drivers/scsi/sd.c @@ -945,7 +945,7 @@ static void requeue_sd_request (Scsi_Cmnd * SCpnt) printk("maxsg = %x, counted = %d this_count = %d\n", max_sg, counted, this_count); while(bh){ - printk("[%p %lx] ", bh->b_data, bh->b_size); + printk("[%p %x] ", bh->b_data, bh->b_size); bh = bh->b_reqnext; } if(SCpnt->use_sg < 16) diff --git a/drivers/scsi/st.c b/drivers/scsi/st.c index a5a825de6..dc702848d 100644 --- a/drivers/scsi/st.c +++ b/drivers/scsi/st.c @@ -890,7 +890,7 @@ scsi_tape_flush(struct file * filp) kdev_t devt = inode->i_rdev; int dev; - if (filp->f_count > 1) + if (atomic_read(&filp->f_count) > 1) return 0; dev = TAPE_NR(devt); |