diff --git a/[refs] b/[refs] index c350ec6ae2c2..b0585b99b009 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 81c553299ffc4ce3512a6ea3eaf5070c2238c960 +refs/heads/master: e3db6cb42123f6dbde36122a4c81a06282370e1e diff --git a/trunk/net/9p/trans_fd.c b/trunk/net/9p/trans_fd.c index 1df0356f242b..c613ed08a5ee 100644 --- a/trunk/net/9p/trans_fd.c +++ b/trunk/net/9p/trans_fd.c @@ -417,7 +417,7 @@ static int p9_fd_write(struct p9_client *client, void *v, int len) oldfs = get_fs(); set_fs(get_ds()); /* The cast to a user pointer is valid due to the set_fs() */ - ret = vfs_write(ts->wr, (void __user *)v, len, &ts->wr->f_pos); + ret = vfs_write(ts->wr, (__force void __user *)v, len, &ts->wr->f_pos); set_fs(oldfs); if (ret <= 0 && ret != -ERESTARTSYS && ret != -EAGAIN)