aboutsummaryrefslogtreecommitdiff
path: root/include/linux/uio.h
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2009-08-04 15:05:39 +0900
committerPaul Mundt <lethal@linux-sh.org>2009-08-04 15:05:39 +0900
commit00111076f725ec498f5ada19cdd984d111b0e9b3 (patch)
treed7d08779bfc836382537c23298613f5948368bdc /include/linux/uio.h
parent133b170f08d6c20578f25b1ae71f80a5e638ccb6 (diff)
parent2e6713c7662cc5ebc7346b033c404cb2f708fd51 (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6 into sh/hwblk
Diffstat (limited to 'include/linux/uio.h')
-rw-r--r--include/linux/uio.h17
1 files changed, 8 insertions, 9 deletions
diff --git a/include/linux/uio.h b/include/linux/uio.h
index b7fe13883bd..98c114323a8 100644
--- 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