summaryrefslogtreecommitdiff
path: root/include/linux/uio.h
diff options
context:
space:
mode:
authorJiri Slaby <jirislaby@gmail.com>2009-07-29 15:04:19 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-07-29 19:10:39 -0700
commit812ed032cdc8138b7546eecc996879756b92d801 (patch)
tree6285496aedfaedbf63b472a2f09ab944af9a86e0 /include/linux/uio.h
parent8da14b5fc32368f582df09fe9c0bec2507868583 (diff)
downloadlinux-3.10-812ed032cdc8138b7546eecc996879756b92d801.tar.gz
linux-3.10-812ed032cdc8138b7546eecc996879756b92d801.tar.bz2
linux-3.10-812ed032cdc8138b7546eecc996879756b92d801.zip
uio: mark uio.h functions __KERNEL__ only
To avoid userspace build failures such as: .../linux/uio.h:37: error: expected `=', `,', `;', `asm' or `__attribute__' before `iov_length' .../linux/uio.h:47: error: expected declaration specifiers or `...' before `size_t' move uio functions inside a __KERNEL__ block. Signed-off-by: Jiri Slaby <jirislaby@gmail.com> Acked-by: Sam Ravnborg <sam@ravnborg.org> Cc: Alexander Viro <viro@zeniv.linux.org.uk> Cc: Christoph Hellwig <hch@infradead.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
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