diff options
| author | Jens Axboe <axboe@hera.kernel.org> | 2002-09-10 13:38:43 -0700 |
|---|---|---|
| committer | Jens Axboe <axboe@hera.kernel.org> | 2002-09-10 13:38:43 -0700 |
| commit | fe0e434158eda051ea025b7fea02eec5f01e04d4 (patch) | |
| tree | c26262b77dc8c78313542aec1dcc53be99e4f441 /include/linux | |
| parent | 76d07e0f8fd008f30db5518085ee195d8ee9ef07 (diff) | |
| parent | 37eb06f8584d6b7557ad802a458855ac775a8d65 (diff) | |
Merge axboe@brick.kernel.dk:/mnt/kernel/ide/linux-2.5
into hera.kernel.org:/home/axboe/BK/linux-2.5-ide
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/ide.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/linux/ide.h b/include/linux/ide.h index 32409745ded5..c9064eff5996 100644 --- a/include/linux/ide.h +++ b/include/linux/ide.h @@ -894,9 +894,10 @@ extern inline void *ide_map_buffer(struct request *rq, unsigned long *flags) return rq->buffer + task_rq_offset(rq); } -extern inline void ide_unmap_buffer(char *buffer, unsigned long *flags) +extern inline void ide_unmap_buffer(struct request *rq, char *buffer, unsigned long *flags) { - bio_kunmap_irq(buffer, flags); + if (rq->bio) + bio_kunmap_irq(buffer, flags); } #define IDE_CHIPSET_PCI_MASK \ |