diff --git a/[refs] b/[refs] index 372c56fc9a4d..ac3cf51b5de7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e3192690a3c889767d1161b228374f4926d92af0 +refs/heads/master: f07d90107caeaa6913c70ad97b536f8cec45e8e7 diff --git a/trunk/net/9p/client.c b/trunk/net/9p/client.c index 5cbea903a5ab..8260f132b32e 100644 --- a/trunk/net/9p/client.c +++ b/trunk/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 = udata; + indata = (__force char *)udata; /* * response header len is 11 * PDU Header(7) + IO Size (4)