Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[cascardo/linux.git] / net / 9p / client.c

diff --git a/net/9p/client.c b/net/9p/client.c
index a170893..8260f13 100644 (file)
--- a/net/9p/client.c
+++ b/net/9p/client.c
@@ -1548,7 +1548,7 @@ p9_client_read(struct p9_fid *fid, char *data, char __user *udata, u64 offset,
                        kernel_buf = 1;
                        indata = data;
                } else
-                       indata = (char *)udata;
+                       indata = (__force char *)udata;
                /*
                 * response header len is 11
                 * PDU Header(7) + IO Size (4)