Merge branch 'akpm' (patches from Andrew)

[linux-2.6-microblaze.git] / block / blk-map.c

diff --git a/block/blk-map.c b/block/blk-map.c
index 4639bc6..4526add 100644 (file)
--- a/block/blk-map.c
+++ b/block/blk-map.c
@@ -400,7 +400,7 @@ static void bio_copy_kern_endio_read(struct bio *bio)
        struct bvec_iter_all iter_all;
 
        bio_for_each_segment_all(bvec, bio, iter_all) {
-               memcpy(p, page_address(bvec->bv_page), bvec->bv_len);
+               memcpy_from_bvec(p, bvec);
                p += bvec->bv_len;
        }