aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/uio.h
diff options
context:
space:
mode:
authorDavid Howells <dhowells@redhat.com>2012-10-13 05:46:48 -0400
committerDavid Howells <dhowells@redhat.com>2012-10-13 05:46:48 -0400
commit607ca46e97a1b6594b29647d98a32d545c24bdff (patch)
tree30f4c0784bfddb57332cdc0678bd06d1e77fa185 /include/linux/uio.h
parent08cce05c5a91f5017f4edc9866cf026908c73f9f (diff)
UAPI: (Scripted) Disintegrate include/linux
Signed-off-by: David Howells <dhowells@redhat.com> Acked-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Thomas Gleixner <tglx@linutronix.de> Acked-by: Michael Kerrisk <mtk.manpages@gmail.com> Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com> Acked-by: Dave Jones <davej@redhat.com>
Diffstat (limited to 'include/linux/uio.h')
-rw-r--r--include/linux/uio.h24
1 files changed, 3 insertions, 21 deletions
diff --git a/include/linux/uio.h b/include/linux/uio.h
index 98c114323a8b..629aaf51f30b 100644
--- a/include/linux/uio.h
+++ b/include/linux/uio.h
@@ -1,9 +1,3 @@
1#ifndef __LINUX_UIO_H
2#define __LINUX_UIO_H
3
4#include <linux/compiler.h>
5#include <linux/types.h>
6
7/* 1/*
8 * Berkeley style UIO structures - Alan Cox 1994. 2 * Berkeley style UIO structures - Alan Cox 1994.
9 * 3 *
@@ -12,21 +6,11 @@
12 * as published by the Free Software Foundation; either version 6 * as published by the Free Software Foundation; either version
13 * 2 of the License, or (at your option) any later version. 7 * 2 of the License, or (at your option) any later version.
14 */ 8 */
9#ifndef __LINUX_UIO_H
10#define __LINUX_UIO_H
15 11
16struct iovec 12#include <uapi/linux/uio.h>
17{
18 void __user *iov_base; /* BSD uses caddr_t (1003.1g requires void *) */
19 __kernel_size_t iov_len; /* Must be size_t (1003.1g) */
20};
21
22/*
23 * UIO_MAXIOV shall be at least 16 1003.1g (5.4.1.1)
24 */
25
26#define UIO_FASTIOV 8
27#define UIO_MAXIOV 1024
28 13
29#ifdef __KERNEL__
30 14
31struct kvec { 15struct kvec {
32 void *iov_base; /* and that should *never* hold a userland pointer */ 16 void *iov_base; /* and that should *never* hold a userland pointer */
@@ -52,5 +36,3 @@ static inline size_t iov_length(const struct iovec *iov, unsigned long nr_segs)
52 36
53unsigned long iov_shorten(struct iovec *iov, unsigned long nr_segs, size_t to); 37unsigned long iov_shorten(struct iovec *iov, unsigned long nr_segs, size_t to);
54#endif 38#endif
55
56#endif