diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-09-28 22:25:29 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-09-28 22:25:29 +0000 |
| commit | 0ae8dceaebe3659ee0c3352c08125f403e77ebca (patch) | |
| tree | 5085c389f09da78182b899d19fe1068b619a69dd /drivers/block/ll_rw_blk.c | |
| parent | 273767781288c35c9d679e908672b9996cda4c34 (diff) | |
Merge with 2.3.10.
Diffstat (limited to 'drivers/block/ll_rw_blk.c')
| -rw-r--r-- | drivers/block/ll_rw_blk.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/drivers/block/ll_rw_blk.c b/drivers/block/ll_rw_blk.c index baab892ef..c4824b9b2 100644 --- a/drivers/block/ll_rw_blk.c +++ b/drivers/block/ll_rw_blk.c @@ -347,6 +347,9 @@ void add_request(struct blk_dev_struct * dev, struct request * req) /* for SCSI devices, call request_fn unconditionally */ if (scsi_blk_major(MAJOR(req->rq_dev))) queue_new_request = 1; + if (MAJOR(req->rq_dev) >= COMPAQ_SMART2_MAJOR+0 && + MAJOR(req->rq_dev) <= COMPAQ_SMART2_MAJOR+7) + queue_new_request = 1; out: if (queue_new_request) (dev->request_fn)(); @@ -506,6 +509,14 @@ void make_request(int major,int rw, struct buffer_head * bh) case SCSI_DISK7_MAJOR: case SCSI_CDROM_MAJOR: case I2O_MAJOR: + case COMPAQ_SMART2_MAJOR+0: + case COMPAQ_SMART2_MAJOR+1: + case COMPAQ_SMART2_MAJOR+2: + case COMPAQ_SMART2_MAJOR+3: + case COMPAQ_SMART2_MAJOR+4: + case COMPAQ_SMART2_MAJOR+5: + case COMPAQ_SMART2_MAJOR+6: + case COMPAQ_SMART2_MAJOR+7: do { if (req->sem) @@ -717,7 +728,7 @@ end_that_request_last( struct request *req ) wake_up(&wait_for_request); } -__initfunc(int blk_dev_init(void)) +int __init blk_dev_init(void) { struct request * req; struct blk_dev_struct *dev; |