diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-09-14 08:19:08 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-09-14 08:19:08 -0400 |
| commit | 905ec87e93bc9e01b15c60035cd6a50c636cbaef (patch) | |
| tree | 46fd7618d6511611ffc19eb0dd4d7bc6b90a41c2 /fs/bio.c | |
| parent | 1d6ae775d7a948c9575658eb41184fd2e506c0df (diff) | |
| parent | 2f4ba45a75d6383b4a1201169a808ffea416ffa0 (diff) | |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'fs/bio.c')
| -rw-r--r-- | fs/bio.c | 2 |
1 files changed, 1 insertions, 1 deletions
| @@ -683,7 +683,7 @@ struct bio *bio_map_user(request_queue_t *q, struct block_device *bdev, | |||
| 683 | { | 683 | { |
| 684 | struct sg_iovec iov; | 684 | struct sg_iovec iov; |
| 685 | 685 | ||
| 686 | iov.iov_base = (__user void *)uaddr; | 686 | iov.iov_base = (void __user *)uaddr; |
| 687 | iov.iov_len = len; | 687 | iov.iov_len = len; |
| 688 | 688 | ||
| 689 | return bio_map_user_iov(q, bdev, &iov, 1, write_to_vm); | 689 | return bio_map_user_iov(q, bdev, &iov, 1, write_to_vm); |