[NETFILTER] Fix conntrack event cache deadlock/oops

[linux-2.6-omap-h63xx.git] / fs / bio.c

diff --git a/fs/bio.c b/fs/bio.c
index a7d4fd3a329954e18c787673ccf4a15e4369b92f..83a349574567e858fc6b026e99395bddcdfae3c1 100644 (file)
--- a/fs/bio.c
+++ b/fs/bio.c
@@ -683,7 +683,7 @@ struct bio *bio_map_user(request_queue_t *q, struct block_device *bdev,
 {
        struct sg_iovec iov;
 
-       iov.iov_base = (__user void *)uaddr;
+       iov.iov_base = (void __user *)uaddr;
        iov.iov_len = len;
 
        return bio_map_user_iov(q, bdev, &iov, 1, write_to_vm);