diff options
| author | Greg KH <gregkh@suse.de> | 2005-09-09 17:26:01 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-09-09 17:26:01 -0400 |
| commit | 8ccc457722ba226ea72fca6f9ba3b54535d4749e (patch) | |
| tree | e323eda3b7ed55a5398751021e8031c1cae56f9d /fs/bio.c | |
| parent | 20dd026d7f5a6972dc78b4928a99620001fa547d (diff) | |
| parent | 5dce225bd9ea60e28e17076de63df0dee51b2883 (diff) | |
Merge gregkh@master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-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); |