From b34eb570d3890357eb6224171a760e43aa0c4b92 Mon Sep 17 00:00:00 2001
From: Ralf Corsepius <ralf.corsepius@rtems.org>
Date: Wed, 11 Feb 2009 13:21:10 +0000
Subject: Partial update from FreeBSD.

---
 cpukit/libnetworking/kern/kern_subr.c |  1 -
 cpukit/libnetworking/sys/uio.h        | 19 +++++++++++--------
 2 files changed, 11 insertions(+), 9 deletions(-)

(limited to 'cpukit/libnetworking')

diff --git a/cpukit/libnetworking/kern/kern_subr.c b/cpukit/libnetworking/kern/kern_subr.c
index ae4a9898d0..1e25a6496f 100644
--- a/cpukit/libnetworking/kern/kern_subr.c
+++ b/cpukit/libnetworking/kern/kern_subr.c
@@ -70,7 +70,6 @@ uiomove(void *cp, int n, struct uio *uio)
 		switch (uio->uio_segflg) {
 
 		case UIO_USERSPACE:
-		case UIO_USERISPACE:
 			if (uio->uio_rw == UIO_READ)
 				error = copyout(cp, iov->iov_base, cnt);
 			else
diff --git a/cpukit/libnetworking/sys/uio.h b/cpukit/libnetworking/sys/uio.h
index 5aec197848..2c837edc09 100644
--- a/cpukit/libnetworking/sys/uio.h
+++ b/cpukit/libnetworking/sys/uio.h
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)uio.h	8.5 (Berkeley) 2/22/94
- * $FreeBSD: src/sys/sys/uio.h,v 1.38 2005/01/07 02:29:24 imp Exp $
+ * $FreeBSD: src/sys/sys/uio.h,v 1.40 2006/11/29 19:08:45 alfred Exp $
  */
 
 /*
@@ -54,7 +54,6 @@ enum	uio_rw { UIO_READ, UIO_WRITE };
 enum uio_seg {
 	UIO_USERSPACE,		/* from user data space */
 	UIO_SYSSPACE,		/* from system space */
-	UIO_USERISPACE,		/* from user I space */
 	UIO_NOCOPY		/* don't copy, already in object */
 };
 #endif
@@ -62,13 +61,17 @@ enum uio_seg {
 #ifdef _KERNEL
 
 struct uio {
-	struct	iovec *uio_iov;
-	int	uio_iovcnt;
-	off_t	uio_offset;
-	int	uio_resid;
-	enum	uio_seg uio_segflg;
-	enum	uio_rw uio_rw;
+	struct	iovec *uio_iov;		/* scatter/gather list */
+	int	uio_iovcnt;		/* length of scatter/gather list */
+	off_t	uio_offset;		/* offset in target object */
+	int	uio_resid;		/* remaining bytes to process */
+	enum	uio_seg uio_segflg;	/* address space */
+	enum	uio_rw uio_rw;		/* operation */
+#if !defined(__rtems__)
+	struct	thread *uio_td;		/* owner */
+#else
 	struct	proc *uio_procp;
+#endif /* !__rtems__ */
 };
 
 /*
-- 
cgit v1.2.3