From eb687d4f291cbbc2182b5160fd026f28578a02d4 Mon Sep 17 00:00:00 2001
From: Hiten Pandya <hmp@dragonflybsd.org>
Date: Tue, 27 Jul 2004 13:11:22 +0000
Subject: [PATCH] Remove UIO_USERISPACE, we do not support any split
 instruction/data address space machines such as the PDP-11.  It is not used
 anywhere in the kernel.

Remove it from the manual page as well; the only place where it is
referenced now is the old 4.4BSD FS Interface doc which cannott be
changed.

Mostly obtained from FreeBSD -HEAD.
---
 share/man/man9/uio.9                 |  7 ++-----
 sys/i386/i386/uio_machdep.c          |  3 +--
 sys/kern/kern_subr.c                 | 12 +-----------
 sys/platform/pc32/i386/uio_machdep.c |  3 +--
 sys/sys/uio.h                        |  3 +--
 5 files changed, 6 insertions(+), 22 deletions(-)

diff --git a/share/man/man9/uio.9 b/share/man/man9/uio.9
index 7eb4cf4c2f..66888586dd 100644
--- a/share/man/man9/uio.9
+++ b/share/man/man9/uio.9
@@ -24,7 +24,7 @@
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\" $FreeBSD: src/share/man/man9/uio.9,v 1.5.2.4 2001/12/17 11:30:19 ru Exp $
-.\" $DragonFly: src/share/man/man9/uio.9,v 1.2 2003/06/17 04:37:01 dillon Exp $
+.\" $DragonFly: src/share/man/man9/uio.9,v 1.3 2004/07/27 13:11:22 hmp Exp $
 .\"
 .Dd February 2, 1997
 .Os
@@ -91,14 +91,11 @@ The offset into the device.
 The number of bytes to process.
 .It Va uio_segflg
 One of the following flags:
-.Bl -tag -width ".Dv UIO_USERISPACE"
+.Bl -tag -width ".Dv UIO_USERSPACE"
 .It Dv UIO_USERSPACE
 The I/O vector points into a process's address space.
 .It Dv UIO_SYSSPACE
 The I/O vector points into the kernel address space.
-.It Dv UIO_USERISPACE
-The I/O vector points into the instruction area of a process's address
-space.
 .It Dv UIO_NOCOPY
 Don't copy, already in object.
 .El
diff --git a/sys/i386/i386/uio_machdep.c b/sys/i386/i386/uio_machdep.c
index 4ae3ad8ccc..4dc72567c6 100644
--- a/sys/i386/i386/uio_machdep.c
+++ b/sys/i386/i386/uio_machdep.c
@@ -34,7 +34,7 @@
  *
  * @(#)kern_subr.c	8.3 (Berkeley) 1/21/94
  * $FreeBSD: src/sys/i386/i386/uio_machdep.c,v 1.1 2004/03/21 20:28:36 alc Exp $
- * $DragonFly: src/sys/i386/i386/Attic/uio_machdep.c,v 1.5 2004/06/28 02:49:06 drhodus Exp $
+ * $DragonFly: src/sys/i386/i386/Attic/uio_machdep.c,v 1.6 2004/07/27 13:11:22 hmp Exp $
  */
 
 #include <sys/param.h>
@@ -110,7 +110,6 @@ uiomove_fromphys(vm_page_t *ma, vm_offset_t offset, int n, struct uio *uio)
 			else
 				bcopy(iov->iov_base, cp, cnt);
 			break;
-		case UIO_USERISPACE:
 		case UIO_NOCOPY:
 			break;
 		}
diff --git a/sys/kern/kern_subr.c b/sys/kern/kern_subr.c
index 8867c0169a..9c05777186 100644
--- a/sys/kern/kern_subr.c
+++ b/sys/kern/kern_subr.c
@@ -37,7 +37,7 @@
  *
  *	@(#)kern_subr.c	8.3 (Berkeley) 1/21/94
  * $FreeBSD: src/sys/kern/kern_subr.c,v 1.31.2.2 2002/04/21 08:09:37 bde Exp $
- * $DragonFly: src/sys/kern/kern_subr.c,v 1.16 2004/05/02 07:59:34 dillon Exp $
+ * $DragonFly: src/sys/kern/kern_subr.c,v 1.17 2004/07/27 13:11:22 hmp Exp $
  */
 
 #include "opt_ddb.h"
@@ -95,7 +95,6 @@ uiomove(caddr_t cp, int n, struct uio *uio)
 		switch (uio->uio_segflg) {
 
 		case UIO_USERSPACE:
-		case UIO_USERISPACE:
 			if (ticks - baseticks >= hogticks) {
 				uio_yield();
 				baseticks = ticks;
@@ -182,7 +181,6 @@ uiomoveco(cp, n, uio, obj)
 		switch (uio->uio_segflg) {
 
 		case UIO_USERSPACE:
-		case UIO_USERISPACE:
 			if (ticks - baseticks >= hogticks) {
 				uio_yield();
 				baseticks = ticks;
@@ -330,10 +328,6 @@ again:
 		*iov->iov_base = c;
 		break;
 
-	case UIO_USERISPACE:
-		if (suibyte(iov->iov_base, c) < 0)
-			return (EFAULT);
-		break;
 	case UIO_NOCOPY:
 		break;
 	}
@@ -376,10 +370,6 @@ again:
 	case UIO_SYSSPACE:
 		c = *(u_char *) iov->iov_base;
 		break;
-
-	case UIO_USERISPACE:
-		c = fuibyte(iov->iov_base);
-		break;
 	}
 	if (c < 0)
 		return (-1);
diff --git a/sys/platform/pc32/i386/uio_machdep.c b/sys/platform/pc32/i386/uio_machdep.c
index 53374fe81b..d3037cad27 100644
--- a/sys/platform/pc32/i386/uio_machdep.c
+++ b/sys/platform/pc32/i386/uio_machdep.c
@@ -34,7 +34,7 @@
  *
  * @(#)kern_subr.c	8.3 (Berkeley) 1/21/94
  * $FreeBSD: src/sys/i386/i386/uio_machdep.c,v 1.1 2004/03/21 20:28:36 alc Exp $
- * $DragonFly: src/sys/platform/pc32/i386/Attic/uio_machdep.c,v 1.5 2004/06/28 02:49:06 drhodus Exp $
+ * $DragonFly: src/sys/platform/pc32/i386/Attic/uio_machdep.c,v 1.6 2004/07/27 13:11:22 hmp Exp $
  */
 
 #include <sys/param.h>
@@ -110,7 +110,6 @@ uiomove_fromphys(vm_page_t *ma, vm_offset_t offset, int n, struct uio *uio)
 			else
 				bcopy(iov->iov_base, cp, cnt);
 			break;
-		case UIO_USERISPACE:
 		case UIO_NOCOPY:
 			break;
 		}
diff --git a/sys/sys/uio.h b/sys/sys/uio.h
index 8b287af48a..c14b1d76d2 100644
--- a/sys/sys/uio.h
+++ b/sys/sys/uio.h
@@ -32,7 +32,7 @@
  *
  *	@(#)uio.h	8.5 (Berkeley) 2/22/94
  * $FreeBSD: src/sys/sys/uio.h,v 1.11.2.1 2001/09/28 16:58:35 dillon Exp $
- * $DragonFly: src/sys/sys/uio.h,v 1.8 2004/03/28 08:25:46 dillon Exp $
+ * $DragonFly: src/sys/sys/uio.h,v 1.9 2004/07/27 13:11:22 hmp Exp $
  */
 
 #ifndef _SYS_UIO_H_
@@ -55,7 +55,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 */
 };
 
-- 
2.41.0