Merge to Fedora kernel-2.6.7-1.441

[linux-2.6.git] / net / core / iovec.c

diff --git a/net/core/iovec.c b/net/core/iovec.c
index 0f3c8b6..89de935 100644 (file)
--- a/net/core/iovec.c
+++ b/net/core/iovec.c
@@ -157,7 +157,7 @@ int memcpy_fromiovecend(unsigned char *kdata, struct iovec *iov, int offset,
        }
 
        while (len > 0) {
-               u8 *base = iov->iov_base + offset;
+               u8 __user *base = iov->iov_base + offset;
                int copy = min_t(unsigned int, len, iov->iov_len - offset);
 
                offset = 0;