diff --git a/[refs] b/[refs] index 9f38ff8560d6..12879cdfdb4b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1e0dbafd30b2e1cd17fd141f4cfd633078524e8c +refs/heads/master: 90cbad65911b5952a03111423347a6ab38236e0b diff --git a/trunk/fs/compat.c b/trunk/fs/compat.c index 4d3fbcb2ddb1..50624d4a70c6 100644 --- a/trunk/fs/compat.c +++ b/trunk/fs/compat.c @@ -1316,7 +1316,7 @@ compat_sys_vmsplice(int fd, const struct compat_iovec __user *iov32, unsigned int nr_segs, unsigned int flags) { unsigned i; - struct iovec *iov; + struct iovec __user *iov; if (nr_segs > UIO_MAXIOV) return -EINVAL; iov = compat_alloc_user_space(nr_segs * sizeof(struct iovec));