Merge branch 'for-1111' of git://gitorious.org/smack-next/kernel into for-linus

[firefly-linux-kernel-4.4.55.git] / include / linux / uio.h

diff --git a/include/linux/uio.h b/include/linux/uio.h
index b7fe13883bdb1ba2682b503cff268c7e3618df9b..98c114323a8be51299300bf440ec6ff167ac2fdb 100644 (file)
--- a/include/linux/uio.h
+++ b/include/linux/uio.h
@@ -19,15 +19,6 @@ struct iovec
        __kernel_size_t iov_len; /* Must be size_t (1003.1g) */
 };
 
-#ifdef __KERNEL__
-
-struct kvec {
-       void *iov_base; /* and that should *never* hold a userland pointer */
-       size_t iov_len;
-};
-
-#endif
-
 /*
  *     UIO_MAXIOV shall be at least 16 1003.1g (5.4.1.1)
  */
@@ -35,6 +26,13 @@ struct kvec {
 #define UIO_FASTIOV    8
 #define UIO_MAXIOV     1024
 
+#ifdef __KERNEL__
+
+struct kvec {
+       void *iov_base; /* and that should *never* hold a userland pointer */
+       size_t iov_len;
+};
+
 /*
  * Total number of bytes covered by an iovec.
  *
@@ -53,5 +51,6 @@ static inline size_t iov_length(const struct iovec *iov, unsigned long nr_segs)
 }
 
 unsigned long iov_shorten(struct iovec *iov, unsigned long nr_segs, size_t to);
+#endif
 
 #endif