diff --git a/[refs] b/[refs]
index a885f8f7dbbe..5f4e94fee422 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6c9afc655d4df902211d00a437e893881cdef588
+refs/heads/master: 3f70353ea91ad77c83500e70507a239b2ab0c980
diff --git a/trunk/fs/bio.c b/trunk/fs/bio.c
index a7d4fd3a3299..83a349574567 100644
--- a/trunk/fs/bio.c
+++ b/trunk/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);