diff options
| author | James Bottomley <jejb@titanic.(none)> | 2005-08-28 10:43:07 -0500 |
|---|---|---|
| committer | James Bottomley <jejb@titanic.(none)> | 2005-08-28 10:43:07 -0500 |
| commit | 31151ba2cef171344beac254e65bd7e00138bb0d (patch) | |
| tree | a8f9cd3c0395656d974125c0ca7ed635aacddeee /include/linux/bio.h | |
| parent | 3d52acb34247816c453f94596e6c7fc4499b76dc (diff) | |
| parent | 73747aed04d3b3fb694961d025f81863b99c6898 (diff) | |
| download | blackbird-obmc-linux-31151ba2cef171344beac254e65bd7e00138bb0d.tar.gz blackbird-obmc-linux-31151ba2cef171344beac254e65bd7e00138bb0d.zip | |
fix mismerge in ll_rw_blk.c
Diffstat (limited to 'include/linux/bio.h')
| -rw-r--r-- | include/linux/bio.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/linux/bio.h b/include/linux/bio.h index 36ef29fa0d8b..4fda06da56c1 100644 --- a/include/linux/bio.h +++ b/include/linux/bio.h @@ -295,7 +295,13 @@ extern int bio_add_page(struct bio *, struct page *, unsigned int,unsigned int); extern int bio_get_nr_vecs(struct block_device *); extern struct bio *bio_map_user(struct request_queue *, struct block_device *, unsigned long, unsigned int, int); +struct sg_iovec; +extern struct bio *bio_map_user_iov(struct request_queue *, + struct block_device *, + struct sg_iovec *, int, int); extern void bio_unmap_user(struct bio *); +extern struct bio *bio_map_kern(struct request_queue *, void *, unsigned int, + unsigned int); extern void bio_set_pages_dirty(struct bio *bio); extern void bio_check_pages_dirty(struct bio *bio); extern struct bio *bio_copy_user(struct request_queue *, unsigned long, unsigned int, int); |
