Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

[karo-tx-linux.git] / fs / compat.c

diff --git a/fs/compat.c b/fs/compat.c
index 4d3fbcb2ddb1a32353dcf6001c9a4f53e42e94d4..50624d4a70c6c771b14c6ff12de3fbde65175aa7 100644 (file)
--- a/fs/compat.c
+++ b/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));