From 7e0afef425040b67de877841b65b7a3996e5e089 Mon Sep 17 00:00:00 2001
From: Jiri Slaby <jirislaby@gmail.com>
Date: Wed, 29 Jul 2009 15:04:19 -0700
Subject: [PATCH] --- yaml --- r: 156056 b: refs/heads/master c:
 812ed032cdc8138b7546eecc996879756b92d801 h: refs/heads/master v: v3

---
 [refs]                    |  2 +-
 trunk/include/linux/uio.h | 17 ++++++++---------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index ae9a2c8655d9..013de6376e9a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8da14b5fc32368f582df09fe9c0bec2507868583
+refs/heads/master: 812ed032cdc8138b7546eecc996879756b92d801
diff --git a/trunk/include/linux/uio.h b/trunk/include/linux/uio.h
index b7fe13883bdb..98c114323a8b 100644
--- a/trunk/include/linux/uio.h
+++ b/trunk/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