diff --git a/sys/compat/sunos/sun_misc.c b/sys/compat/sunos/sun_misc.c
index bf3473e50a09..bd5d68705559 100644
--- a/sys/compat/sunos/sun_misc.c
+++ b/sys/compat/sunos/sun_misc.c
@@ -42,7 +42,7 @@
  *	@(#)sun_misc.c	8.1 (Berkeley) 6/18/93
  *
  * from: Header: sun_misc.c,v 1.16 93/04/07 02:46:27 torek Exp 
- * $Id: sun_misc.c,v 1.13 1994/03/03 14:15:25 deraadt Exp $
+ * $Id: sun_misc.c,v 1.14 1994/03/27 09:08:02 cgd Exp $
  */
 
 /*
@@ -414,84 +414,45 @@ out:
 	return (error);
 }
 
-/*
- * The Sun bit-style arguments are not in the same order as the
- * NetBSD ones. We must remap the bits.
- */
-
 #if defined(sparc)
 #define	DEVZERO	makedev(3, 12)		/* major,minor of /dev/zero */
 #else /* all m68k architectures */
 #define	DEVZERO	makedev(2, 12)		/* major,minor of /dev/zero */
 #endif
 
-#define SUN_PROT_READ	1
-#define SUN_PROT_WRITE	2
-#define SUN_PROT_EXEC	4
-#define SUN_PROT_UALL	(SUN_PROT_READ | SUN_PROT_WRITE | SUN_PROT_EXEC)
-
 #define	SUN__MAP_NEW	0x80000000	/* if not, old mmap & cannot handle */
 
-#define SUN_MAP_SHARED	1
-#define SUN_MAP_PRIVATE	2
-#define	SUN_MAP_TYPE	0xf
-#define SUN_MAP_FIXED	0x10
-
 struct sun_mmap_args {
 	caddr_t	addr;
 	size_t	len;
 	int	prot;
 	int	flags;
 	int	fd;
-	off_t	off;
+	long	off;
 };
 sun_mmap(p, uap, retval)
 	register struct proc *p;
 	register struct sun_mmap_args *uap;
 	int *retval;
 {
-	register int flags, prot, newflags, newprot;
 	register struct filedesc *fdp;
 	register struct file *fp;
 	register struct vnode *vp;
 
 	/*
-	 * Verify and re-map the arguments.
+	 * Verify the arguments.
 	 */
-	prot = uap->prot;
-	newprot = 0;
-	if (uap->prot & ~SUN_PROT_UALL)
+	if (uap->prot & ~(PROT_READ|PROT_WRITE|PROT_EXEC))
+		return (EINVAL);			/* XXX still needed? */
+
+	if ((uap->flags & SUN__MAP_NEW) == 0)
 		return (EINVAL);
-	if (uap->prot & SUN_PROT_READ)
-		newprot |= PROT_READ;
-	if (uap->prot & SUN_PROT_WRITE)
-		newprot |= PROT_WRITE;
-	if (uap->prot & SUN_PROT_EXEC)
-		newprot |= PROT_EXEC;
+	uap->flags &= ~SUN__MAP_NEW;
 
-	flags = uap->flags;
-	newflags = 0;
-	if ((flags & SUN__MAP_NEW) == 0)
-		return (EINVAL);
-
-	switch (flags & SUN_MAP_TYPE) {
-	case SUN_MAP_SHARED:
-		newflags |= MAP_SHARED;
-		break;
-	case SUN_MAP_PRIVATE:
-		newflags |= MAP_PRIVATE;
-		break;
-	default:
-		return (EINVAL);
-	}
-
-	if (flags & SUN_MAP_FIXED)
-		newflags |= MAP_FIXED;
-
-	if ((newflags & MAP_FIXED) == 0 &&
+	if ((uap->flags & MAP_FIXED) == 0 &&
 		uap->addr != 0 &&
-		uap->addr < (caddr_t)round_page(p->p_vmspace->vm_daddr + MAXDSIZ))
-		uap->addr = (caddr_t)round_page(p->p_vmspace->vm_daddr + MAXDSIZ);
+		uap->addr < (caddr_t)round_page(p->p_vmspace->vm_daddr+MAXDSIZ))
+		uap->addr = (caddr_t)round_page(p->p_vmspace->vm_daddr+MAXDSIZ);
 
 	/*
 	 * Special case: if fd refers to /dev/zero, map as MAP_ANON.  (XXX)
@@ -502,14 +463,10 @@ sun_mmap(p, uap, retval)
 	    fp->f_type == DTYPE_VNODE &&				/*XXX*/
 	    (vp = (struct vnode *)fp->f_data)->v_type == VCHR &&	/*XXX*/
 	    vp->v_rdev == DEVZERO) {					/*XXX*/
-		newflags |= MAP_ANON;
+		uap->flags |= MAP_ANON;
 		uap->fd = -1;
-	} else
-		newflags |= MAP_FILE;
+	}
 
-	/* All done, fix up fields and go. */
-	uap->flags = newflags;
-	uap->prot = newprot;
 	return (smmap(p, uap, retval));
 }
 
diff --git a/sys/compat/sunos/sun_syscall.h b/sys/compat/sunos/sun_syscall.h
index a6003949c12e..cc587f68f568 100644
--- a/sys/compat/sunos/sun_syscall.h
+++ b/sys/compat/sunos/sun_syscall.h
@@ -2,7 +2,7 @@
  * System call numbers.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	$Id: sun_syscall.h,v 1.10 1994/03/03 14:15:53 deraadt Exp $
+ * created from	$Id: sun_syscall.h,v 1.11 1994/03/27 09:08:06 cgd Exp $
  */
 
 #define	SYS_syscall	0
@@ -59,7 +59,7 @@
 #define	SYS_execve	59
 #define	SYS_umask	60
 #define	SYS_chroot	61
-#define	SYS_fstat	62
+#define	SYS_ofstat	62
 #define	SYS_getpagesize	64
 #define	SYS_sun_omsync	65
 #define	SYS_vfork	66
diff --git a/sys/compat/sunos/sun_syscalls.c b/sys/compat/sunos/sun_syscalls.c
index 2f0ba233cf9b..e16aaae5c8c8 100644
--- a/sys/compat/sunos/sun_syscalls.c
+++ b/sys/compat/sunos/sun_syscalls.c
@@ -2,7 +2,7 @@
  * System call names.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	$Id: sun_syscalls.c,v 1.10 1994/03/03 14:15:54 deraadt Exp $
+ * created from	$Id: sun_syscalls.c,v 1.11 1994/03/27 09:08:08 cgd Exp $
  */
 
 char *sun_syscallnames[] = {
@@ -68,7 +68,7 @@ char *sun_syscallnames[] = {
 	"execve",			/* 59 = execve */
 	"umask",			/* 60 = umask */
 	"chroot",			/* 61 = chroot */
-	"fstat",			/* 62 = fstat */
+	"ofstat",			/* 62 = ofstat */
 	"#63",			/* 63 = nosys */
 	"getpagesize",			/* 64 = getpagesize */
 	"sun_omsync",			/* 65 = sun_omsync */
diff --git a/sys/compat/sunos/sun_sysent.c b/sys/compat/sunos/sun_sysent.c
index 052632f5fa52..f2d8e76479b1 100644
--- a/sys/compat/sunos/sun_sysent.c
+++ b/sys/compat/sunos/sun_sysent.c
@@ -2,7 +2,7 @@
  * System call switch table.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	$Id: sun_sysent.c,v 1.10 1994/03/03 14:15:55 deraadt Exp $
+ * created from	$Id: sun_sysent.c,v 1.11 1994/03/27 09:08:09 cgd Exp $
  */
 
 #include <sys/param.h>
@@ -27,14 +27,14 @@ int	sun_mknod();
 int	chmod();
 int	chown();
 int	obreak();
-int	lseek();
+int	olseek();
 int	getpid();
 int	getuid();
 int	saccess();
 int	sync();
 int	kill();
-int	stat();
-int	lstat();
+int	ostat();
+int	olstat();
 int	dup();
 int	pipe();
 int	profil();
@@ -48,7 +48,7 @@ int	readlink();
 int	execve();
 int	umask();
 int	chroot();
-int	fstat();
+int	ofstat();
 int	getpagesize();
 int	sun_omsync();
 int	vfork();
@@ -104,8 +104,8 @@ int	orecvfrom();
 int	osetreuid();
 int	osetregid();
 int	rename();
-int	truncate();
-int	ftruncate();
+int	otruncate();
+int	oftruncate();
 int	flock();
 int	sendto();
 int	shutdown();
@@ -222,7 +222,7 @@ struct sysent sun_sysent[] = {
 	{ 3, chown },			/* 16 = chown */
 	{ 1, obreak },			/* 17 = break */
 	{ compat(2,sun_stat) },		/* 18 = old sun_stat */
-	{ 3, lseek },			/* 19 = lseek */
+	{ 3, olseek },			/* 19 = lseek */
 	{ 0, getpid },			/* 20 = getpid */
 	{ 0, nosys },			/* 21 = obsolete sun_old_mount */
 	{ 0, nosys },			/* 22 = System V umount */
@@ -241,9 +241,9 @@ struct sysent sun_sysent[] = {
 	{ compat(1,sun_ftime) },		/* 35 = old sun_ftime */
 	{ 0, sync },			/* 36 = sync */
 	{ 2, kill },			/* 37 = kill */
-	{ 2, stat },			/* 38 = stat */
+	{ 2, ostat },			/* 38 = stat */
 	{ compat(2,sun_setpgrp) },		/* 39 = old sun_setpgrp */
-	{ 2, lstat },			/* 40 = lstat */
+	{ 2, olstat },			/* 40 = lstat */
 	{ 2, dup },			/* 41 = dup */
 	{ 0, pipe },			/* 42 = pipe */
 	{ compat(1,sun_times) },		/* 43 = old sun_times */
@@ -265,7 +265,7 @@ struct sysent sun_sysent[] = {
 	{ 3, execve },			/* 59 = execve */
 	{ 1, umask },			/* 60 = umask */
 	{ 1, chroot },			/* 61 = chroot */
-	{ 2, fstat },			/* 62 = fstat */
+	{ 2, ofstat },			/* 62 = ofstat */
 	{ 0, nosys },			/* 63 = nosys */
 	{ 0, getpagesize },			/* 64 = getpagesize */
 	{ 3, sun_omsync },			/* 65 = sun_omsync */
@@ -332,8 +332,8 @@ struct sysent sun_sysent[] = {
 	{ 2, osetreuid },			/* 126 = osetreuid */
 	{ 2, osetregid },			/* 127 = osetregid */
 	{ 2, rename },			/* 128 = rename */
-	{ 2, truncate },			/* 129 = truncate */
-	{ 2, ftruncate },			/* 130 = ftruncate */
+	{ 2, otruncate },			/* 129 = truncate */
+	{ 2, oftruncate },			/* 130 = ftruncate */
 	{ 2, flock },			/* 131 = flock */
 	{ 0, nosys },			/* 132 = nosys */
 	{ 6, sendto },			/* 133 = sendto */
diff --git a/sys/compat/sunos/sunos_misc.c b/sys/compat/sunos/sunos_misc.c
index 9fa825d873f7..4554df254631 100644
--- a/sys/compat/sunos/sunos_misc.c
+++ b/sys/compat/sunos/sunos_misc.c
@@ -42,7 +42,7 @@
  *	@(#)sun_misc.c	8.1 (Berkeley) 6/18/93
  *
  * from: Header: sun_misc.c,v 1.16 93/04/07 02:46:27 torek Exp 
- * $Id: sunos_misc.c,v 1.13 1994/03/03 14:15:25 deraadt Exp $
+ * $Id: sunos_misc.c,v 1.14 1994/03/27 09:08:02 cgd Exp $
  */
 
 /*
@@ -414,84 +414,45 @@ out:
 	return (error);
 }
 
-/*
- * The Sun bit-style arguments are not in the same order as the
- * NetBSD ones. We must remap the bits.
- */
-
 #if defined(sparc)
 #define	DEVZERO	makedev(3, 12)		/* major,minor of /dev/zero */
 #else /* all m68k architectures */
 #define	DEVZERO	makedev(2, 12)		/* major,minor of /dev/zero */
 #endif
 
-#define SUN_PROT_READ	1
-#define SUN_PROT_WRITE	2
-#define SUN_PROT_EXEC	4
-#define SUN_PROT_UALL	(SUN_PROT_READ | SUN_PROT_WRITE | SUN_PROT_EXEC)
-
 #define	SUN__MAP_NEW	0x80000000	/* if not, old mmap & cannot handle */
 
-#define SUN_MAP_SHARED	1
-#define SUN_MAP_PRIVATE	2
-#define	SUN_MAP_TYPE	0xf
-#define SUN_MAP_FIXED	0x10
-
 struct sun_mmap_args {
 	caddr_t	addr;
 	size_t	len;
 	int	prot;
 	int	flags;
 	int	fd;
-	off_t	off;
+	long	off;
 };
 sun_mmap(p, uap, retval)
 	register struct proc *p;
 	register struct sun_mmap_args *uap;
 	int *retval;
 {
-	register int flags, prot, newflags, newprot;
 	register struct filedesc *fdp;
 	register struct file *fp;
 	register struct vnode *vp;
 
 	/*
-	 * Verify and re-map the arguments.
+	 * Verify the arguments.
 	 */
-	prot = uap->prot;
-	newprot = 0;
-	if (uap->prot & ~SUN_PROT_UALL)
+	if (uap->prot & ~(PROT_READ|PROT_WRITE|PROT_EXEC))
+		return (EINVAL);			/* XXX still needed? */
+
+	if ((uap->flags & SUN__MAP_NEW) == 0)
 		return (EINVAL);
-	if (uap->prot & SUN_PROT_READ)
-		newprot |= PROT_READ;
-	if (uap->prot & SUN_PROT_WRITE)
-		newprot |= PROT_WRITE;
-	if (uap->prot & SUN_PROT_EXEC)
-		newprot |= PROT_EXEC;
+	uap->flags &= ~SUN__MAP_NEW;
 
-	flags = uap->flags;
-	newflags = 0;
-	if ((flags & SUN__MAP_NEW) == 0)
-		return (EINVAL);
-
-	switch (flags & SUN_MAP_TYPE) {
-	case SUN_MAP_SHARED:
-		newflags |= MAP_SHARED;
-		break;
-	case SUN_MAP_PRIVATE:
-		newflags |= MAP_PRIVATE;
-		break;
-	default:
-		return (EINVAL);
-	}
-
-	if (flags & SUN_MAP_FIXED)
-		newflags |= MAP_FIXED;
-
-	if ((newflags & MAP_FIXED) == 0 &&
+	if ((uap->flags & MAP_FIXED) == 0 &&
 		uap->addr != 0 &&
-		uap->addr < (caddr_t)round_page(p->p_vmspace->vm_daddr + MAXDSIZ))
-		uap->addr = (caddr_t)round_page(p->p_vmspace->vm_daddr + MAXDSIZ);
+		uap->addr < (caddr_t)round_page(p->p_vmspace->vm_daddr+MAXDSIZ))
+		uap->addr = (caddr_t)round_page(p->p_vmspace->vm_daddr+MAXDSIZ);
 
 	/*
 	 * Special case: if fd refers to /dev/zero, map as MAP_ANON.  (XXX)
@@ -502,14 +463,10 @@ sun_mmap(p, uap, retval)
 	    fp->f_type == DTYPE_VNODE &&				/*XXX*/
 	    (vp = (struct vnode *)fp->f_data)->v_type == VCHR &&	/*XXX*/
 	    vp->v_rdev == DEVZERO) {					/*XXX*/
-		newflags |= MAP_ANON;
+		uap->flags |= MAP_ANON;
 		uap->fd = -1;
-	} else
-		newflags |= MAP_FILE;
+	}
 
-	/* All done, fix up fields and go. */
-	uap->flags = newflags;
-	uap->prot = newprot;
 	return (smmap(p, uap, retval));
 }
 
diff --git a/sys/compat/sunos/sunos_syscall.h b/sys/compat/sunos/sunos_syscall.h
index 66956f52aa05..90647b85330b 100644
--- a/sys/compat/sunos/sunos_syscall.h
+++ b/sys/compat/sunos/sunos_syscall.h
@@ -2,7 +2,7 @@
  * System call numbers.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	$Id: sunos_syscall.h,v 1.10 1994/03/03 14:15:53 deraadt Exp $
+ * created from	$Id: sunos_syscall.h,v 1.11 1994/03/27 09:08:06 cgd Exp $
  */
 
 #define	SYS_syscall	0
@@ -59,7 +59,7 @@
 #define	SYS_execve	59
 #define	SYS_umask	60
 #define	SYS_chroot	61
-#define	SYS_fstat	62
+#define	SYS_ofstat	62
 #define	SYS_getpagesize	64
 #define	SYS_sun_omsync	65
 #define	SYS_vfork	66
diff --git a/sys/compat/sunos/sunos_syscalls.c b/sys/compat/sunos/sunos_syscalls.c
index 10c11b0c5d16..5ccb387413fe 100644
--- a/sys/compat/sunos/sunos_syscalls.c
+++ b/sys/compat/sunos/sunos_syscalls.c
@@ -2,7 +2,7 @@
  * System call names.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	$Id: sunos_syscalls.c,v 1.10 1994/03/03 14:15:54 deraadt Exp $
+ * created from	$Id: sunos_syscalls.c,v 1.11 1994/03/27 09:08:08 cgd Exp $
  */
 
 char *sun_syscallnames[] = {
@@ -68,7 +68,7 @@ char *sun_syscallnames[] = {
 	"execve",			/* 59 = execve */
 	"umask",			/* 60 = umask */
 	"chroot",			/* 61 = chroot */
-	"fstat",			/* 62 = fstat */
+	"ofstat",			/* 62 = ofstat */
 	"#63",			/* 63 = nosys */
 	"getpagesize",			/* 64 = getpagesize */
 	"sun_omsync",			/* 65 = sun_omsync */
diff --git a/sys/compat/sunos/sunos_sysent.c b/sys/compat/sunos/sunos_sysent.c
index 319889b1913a..09ea5867c201 100644
--- a/sys/compat/sunos/sunos_sysent.c
+++ b/sys/compat/sunos/sunos_sysent.c
@@ -2,7 +2,7 @@
  * System call switch table.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	$Id: sunos_sysent.c,v 1.10 1994/03/03 14:15:55 deraadt Exp $
+ * created from	$Id: sunos_sysent.c,v 1.11 1994/03/27 09:08:09 cgd Exp $
  */
 
 #include <sys/param.h>
@@ -27,14 +27,14 @@ int	sun_mknod();
 int	chmod();
 int	chown();
 int	obreak();
-int	lseek();
+int	olseek();
 int	getpid();
 int	getuid();
 int	saccess();
 int	sync();
 int	kill();
-int	stat();
-int	lstat();
+int	ostat();
+int	olstat();
 int	dup();
 int	pipe();
 int	profil();
@@ -48,7 +48,7 @@ int	readlink();
 int	execve();
 int	umask();
 int	chroot();
-int	fstat();
+int	ofstat();
 int	getpagesize();
 int	sun_omsync();
 int	vfork();
@@ -104,8 +104,8 @@ int	orecvfrom();
 int	osetreuid();
 int	osetregid();
 int	rename();
-int	truncate();
-int	ftruncate();
+int	otruncate();
+int	oftruncate();
 int	flock();
 int	sendto();
 int	shutdown();
@@ -222,7 +222,7 @@ struct sysent sun_sysent[] = {
 	{ 3, chown },			/* 16 = chown */
 	{ 1, obreak },			/* 17 = break */
 	{ compat(2,sun_stat) },		/* 18 = old sun_stat */
-	{ 3, lseek },			/* 19 = lseek */
+	{ 3, olseek },			/* 19 = lseek */
 	{ 0, getpid },			/* 20 = getpid */
 	{ 0, nosys },			/* 21 = obsolete sun_old_mount */
 	{ 0, nosys },			/* 22 = System V umount */
@@ -241,9 +241,9 @@ struct sysent sun_sysent[] = {
 	{ compat(1,sun_ftime) },		/* 35 = old sun_ftime */
 	{ 0, sync },			/* 36 = sync */
 	{ 2, kill },			/* 37 = kill */
-	{ 2, stat },			/* 38 = stat */
+	{ 2, ostat },			/* 38 = stat */
 	{ compat(2,sun_setpgrp) },		/* 39 = old sun_setpgrp */
-	{ 2, lstat },			/* 40 = lstat */
+	{ 2, olstat },			/* 40 = lstat */
 	{ 2, dup },			/* 41 = dup */
 	{ 0, pipe },			/* 42 = pipe */
 	{ compat(1,sun_times) },		/* 43 = old sun_times */
@@ -265,7 +265,7 @@ struct sysent sun_sysent[] = {
 	{ 3, execve },			/* 59 = execve */
 	{ 1, umask },			/* 60 = umask */
 	{ 1, chroot },			/* 61 = chroot */
-	{ 2, fstat },			/* 62 = fstat */
+	{ 2, ofstat },			/* 62 = ofstat */
 	{ 0, nosys },			/* 63 = nosys */
 	{ 0, getpagesize },			/* 64 = getpagesize */
 	{ 3, sun_omsync },			/* 65 = sun_omsync */
@@ -332,8 +332,8 @@ struct sysent sun_sysent[] = {
 	{ 2, osetreuid },			/* 126 = osetreuid */
 	{ 2, osetregid },			/* 127 = osetregid */
 	{ 2, rename },			/* 128 = rename */
-	{ 2, truncate },			/* 129 = truncate */
-	{ 2, ftruncate },			/* 130 = ftruncate */
+	{ 2, otruncate },			/* 129 = truncate */
+	{ 2, oftruncate },			/* 130 = ftruncate */
 	{ 2, flock },			/* 131 = flock */
 	{ 0, nosys },			/* 132 = nosys */
 	{ 6, sendto },			/* 133 = sendto */
diff --git a/sys/kern/exec_subr.c b/sys/kern/exec_subr.c
index be1b3c731264..08c765276bab 100644
--- a/sys/kern/exec_subr.c
+++ b/sys/kern/exec_subr.c
@@ -27,7 +27,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: exec_subr.c,v 1.5 1994/01/28 23:47:10 jtc Exp $
+ *	$Id: exec_subr.c,v 1.6 1994/03/27 09:08:21 cgd Exp $
  */
 
 #include <sys/param.h>
@@ -142,8 +142,8 @@ vmcmd_map_pagedvn(p, cmd)
 	 * call this routine.
 	 */
 	return vm_mmap(&p->p_vmspace->vm_map, &cmd->ev_addr, cmd->ev_len,
-	    cmd->ev_prot, VM_PROT_ALL, MAP_FIXED|MAP_FILE|MAP_COPY,
-	    cmd->ev_vp, cmd->ev_offset);
+	    cmd->ev_prot, VM_PROT_ALL, MAP_FIXED|MAP_COPY, cmd->ev_vp,
+	    cmd->ev_offset);
 }
 
 /*
diff --git a/sys/kern/init_sysent.c b/sys/kern/init_sysent.c
index edf4dc44c939..222221d0e4c6 100644
--- a/sys/kern/init_sysent.c
+++ b/sys/kern/init_sysent.c
@@ -5,8 +5,8 @@
  * created from: syscalls.master,v 1.11 1994/03/08 23:57:00
  */
 
-#include "param.h"
-#include "systm.h"
+#include <sys/param.h>
+#include <sys/systm.h>
 
 int	nosys();
 
@@ -27,7 +27,6 @@ int	chmod();
 int	chown();
 int	obreak();
 int	getfsstat();
-int	lseek();
 int	getpid();
 int	mount();
 int	unmount();
@@ -46,9 +45,7 @@ int	chflags();
 int	fchflags();
 int	sync();
 int	kill();
-int	stat();
 int	getppid();
-int	lstat();
 int	dup();
 int	pipe();
 int	getegid();
@@ -76,14 +73,12 @@ int	readlink();
 int	execve();
 int	umask();
 int	chroot();
-int	fstat();
 int	getkerninfo();
 int	getpagesize();
 int	msync();
 int	vfork();
 int	sbrk();
 int	sstk();
-int	smmap();
 int	ovadvise();
 int	munmap();
 int	mprotect();
@@ -126,8 +121,6 @@ int	settimeofday();
 int	fchown();
 int	fchmod();
 int	rename();
-int	truncate();
-int	ftruncate();
 int	flock();
 int	mkfifo();
 int	sendto();
@@ -174,6 +167,13 @@ int	shmsys();
 int	setgid();
 int	setegid();
 int	seteuid();
+int	stat();
+int	fstat();
+int	lstat();
+int	smmap();
+int	lseek();
+int	truncate();
+int	ftruncate();
 #ifdef LKM
 int	lkmnosys();
 int	lkmnosys();
@@ -192,12 +192,17 @@ int	lkmnosys();
 #define compat(n, name) n, __CONCAT(o,name)
 
 int	ocreat();
+int	olseek();
+int	ostat();
+int	olstat();
 #ifdef KTRACE
 #else
 #endif
 #ifdef notyet
 #else
 #endif
+int	ofstat();
+int	ommap();
 int	owait();
 int	oaccept();
 int	osend();
@@ -213,6 +218,8 @@ int	osendmsg();
 int	orecvfrom();
 int	osetreuid();
 int	osetregid();
+int	otruncate();
+int	oftruncate();
 int	ogetpeername();
 int	okillpg();
 int	oquota();
@@ -260,7 +267,7 @@ struct sysent sysent[] = {
 	3, chown,			/* 16 = chown */
 	1, obreak,			/* 17 = break */
 	3, getfsstat,			/* 18 = getfsstat */
-	3, lseek,			/* 19 = lseek */
+	compat(3,lseek),		/* 19 = old lseek */
 	0, getpid,			/* 20 = getpid */
 	4, mount,			/* 21 = mount */
 	2, unmount,			/* 22 = unmount */
@@ -279,9 +286,9 @@ struct sysent sysent[] = {
 	2, fchflags,			/* 35 = fchflags */
 	0, sync,			/* 36 = sync */
 	2, kill,			/* 37 = kill */
-	2, stat,			/* 38 = stat */
+	compat(2,stat),		/* 38 = old stat */
 	0, getppid,			/* 39 = getppid */
-	2, lstat,			/* 40 = lstat */
+	compat(2,lstat),		/* 40 = old lstat */
 	2, dup,			/* 41 = dup */
 	0, pipe,			/* 42 = pipe */
 	0, getegid,			/* 43 = getegid */
@@ -311,7 +318,7 @@ struct sysent sysent[] = {
 	3, execve,			/* 59 = execve */
 	1, umask,			/* 60 = umask */
 	1, chroot,			/* 61 = chroot */
-	2, fstat,			/* 62 = fstat */
+	compat(2,fstat),		/* 62 = old fstat */
 	4, getkerninfo,			/* 63 = getkerninfo */
 	0, getpagesize,			/* 64 = getpagesize */
 	2, msync,			/* 65 = msync */
@@ -320,7 +327,7 @@ struct sysent sysent[] = {
 	0, nosys,			/* 68 = obsolete vwrite */
 	1, sbrk,			/* 69 = sbrk */
 	1, sstk,			/* 70 = sstk */
-	6, smmap,			/* 71 = mmap */
+	compat(7,mmap),		/* 71 = old mmap */
 	1, ovadvise,			/* 72 = vadvise */
 	2, munmap,			/* 73 = munmap */
 	3, mprotect,			/* 74 = mprotect */
@@ -382,8 +389,8 @@ struct sysent sysent[] = {
 	compat(2,setreuid),		/* 126 = old setreuid */
 	compat(2,setregid),		/* 127 = old setregid */
 	2, rename,			/* 128 = rename */
-	2, truncate,			/* 129 = truncate */
-	2, ftruncate,			/* 130 = ftruncate */
+	compat(2,truncate),		/* 129 = old truncate */
+	compat(2,ftruncate),		/* 130 = old ftruncate */
 	2, flock,			/* 131 = flock */
 	2, mkfifo,			/* 132 = mkfifo */
 	6, sendto,			/* 133 = sendto */
@@ -462,20 +469,20 @@ struct sysent sysent[] = {
 	0, nosys,			/* 185 = nosys */
 	0, nosys,			/* 186 = nosys */
 	0, nosys,			/* 187 = nosys */
-	0, nosys,			/* 188 = nosys */
-	0, nosys,			/* 189 = nosys */
-	0, nosys,			/* 190 = nosys */
+	2, stat,			/* 188 = stat */
+	2, fstat,			/* 189 = fstat */
+	2, lstat,			/* 190 = lstat */
 	0, nosys,			/* 191 = nosys */
 	0, nosys,			/* 192 = nosys */
 	0, nosys,			/* 193 = nosys */
 	0, nosys,			/* 194 = nosys */
 	0, nosys,			/* 195 = nosys */
 	0, nosys,			/* 196 = nosys */
-	0, nosys,			/* 197 = nosys */
+	8, smmap,			/* 197 = mmap */
 	0, nosys,			/* 198 = nosys */
-	0, nosys,			/* 199 = nosys */
-	0, nosys,			/* 200 = nosys */
-	0, nosys,			/* 201 = nosys */
+	5, lseek,			/* 199 = lseek */
+	4, truncate,			/* 200 = truncate */
+	4, ftruncate,			/* 201 = ftruncate */
 	0, nosys,			/* 202 = nosys */
 	0, nosys,			/* 203 = nosys */
 	0, nosys,			/* 204 = nosys */
diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c
index 35e79b1287b4..651b58d70f4f 100644
--- a/sys/kern/kern_descrip.c
+++ b/sys/kern/kern_descrip.c
@@ -1 +1 @@
-revision 1.12 intentionally removed
+revision 1.13 intentionally removed
diff --git a/sys/kern/kern_prot.c b/sys/kern/kern_prot.c
index a6e3f2871612..37ba0a781f5b 100644
--- a/sys/kern/kern_prot.c
+++ b/sys/kern/kern_prot.c
@@ -1 +1 @@
-revision 1.7 intentionally removed
+revision 1.8 intentionally removed
diff --git a/sys/kern/syscalls.c b/sys/kern/syscalls.c
index aaa843abe82b..a0753c1a34c1 100644
--- a/sys/kern/syscalls.c
+++ b/sys/kern/syscalls.c
@@ -25,7 +25,7 @@ char *syscallnames[] = {
 	"chown",			/* 16 = chown */
 	"break",			/* 17 = break */
 	"getfsstat",			/* 18 = getfsstat */
-	"lseek",			/* 19 = lseek */
+	"old.lseek",		/* 19 = old lseek */
 	"getpid",			/* 20 = getpid */
 	"mount",			/* 21 = mount */
 	"unmount",			/* 22 = unmount */
@@ -44,9 +44,9 @@ char *syscallnames[] = {
 	"fchflags",			/* 35 = fchflags */
 	"sync",			/* 36 = sync */
 	"kill",			/* 37 = kill */
-	"stat",			/* 38 = stat */
+	"old.stat",		/* 38 = old stat */
 	"getppid",			/* 39 = getppid */
-	"lstat",			/* 40 = lstat */
+	"old.lstat",		/* 40 = old lstat */
 	"dup",			/* 41 = dup */
 	"pipe",			/* 42 = pipe */
 	"getegid",			/* 43 = getegid */
@@ -76,7 +76,7 @@ char *syscallnames[] = {
 	"execve",			/* 59 = execve */
 	"umask",			/* 60 = umask */
 	"chroot",			/* 61 = chroot */
-	"fstat",			/* 62 = fstat */
+	"old.fstat",		/* 62 = old fstat */
 	"getkerninfo",			/* 63 = getkerninfo */
 	"getpagesize",			/* 64 = getpagesize */
 	"msync",			/* 65 = msync */
@@ -85,7 +85,7 @@ char *syscallnames[] = {
 	"obs_vwrite",			/* 68 = obsolete vwrite */
 	"sbrk",			/* 69 = sbrk */
 	"sstk",			/* 70 = sstk */
-	"mmap",			/* 71 = mmap */
+	"old.mmap",		/* 71 = old mmap */
 	"vadvise",			/* 72 = vadvise */
 	"munmap",			/* 73 = munmap */
 	"mprotect",			/* 74 = mprotect */
@@ -147,8 +147,8 @@ char *syscallnames[] = {
 	"old.setreuid",		/* 126 = old setreuid */
 	"old.setregid",		/* 127 = old setregid */
 	"rename",			/* 128 = rename */
-	"truncate",			/* 129 = truncate */
-	"ftruncate",			/* 130 = ftruncate */
+	"old.truncate",		/* 129 = old truncate */
+	"old.ftruncate",		/* 130 = old ftruncate */
 	"flock",			/* 131 = flock */
 	"mkfifo",			/* 132 = mkfifo */
 	"sendto",			/* 133 = sendto */
@@ -227,20 +227,20 @@ char *syscallnames[] = {
 	"#185",			/* 185 = nosys */
 	"#186",			/* 186 = nosys */
 	"#187",			/* 187 = nosys */
-	"#188",			/* 188 = nosys */
-	"#189",			/* 189 = nosys */
-	"#190",			/* 190 = nosys */
+	"stat",			/* 188 = stat */
+	"fstat",			/* 189 = fstat */
+	"lstat",			/* 190 = lstat */
 	"#191",			/* 191 = nosys */
 	"#192",			/* 192 = nosys */
 	"#193",			/* 193 = nosys */
 	"#194",			/* 194 = nosys */
 	"#195",			/* 195 = nosys */
 	"#196",			/* 196 = nosys */
-	"#197",			/* 197 = nosys */
+	"mmap",			/* 197 = mmap */
 	"#198",			/* 198 = nosys */
-	"#199",			/* 199 = nosys */
-	"#200",			/* 200 = nosys */
-	"#201",			/* 201 = nosys */
+	"lseek",			/* 199 = lseek */
+	"truncate",			/* 200 = truncate */
+	"ftruncate",			/* 201 = ftruncate */
 	"#202",			/* 202 = nosys */
 	"#203",			/* 203 = nosys */
 	"#204",			/* 204 = nosys */
diff --git a/sys/kern/vfs_syscalls.c b/sys/kern/vfs_syscalls.c
index 515824e99bf1..7365349db370 100644
--- a/sys/kern/vfs_syscalls.c
+++ b/sys/kern/vfs_syscalls.c
@@ -1 +1 @@
-revision 1.15 intentionally removed
+revision 1.16 intentionally removed
diff --git a/sys/msdosfs/msdosfsmount.h b/sys/msdosfs/msdosfsmount.h
index 2fbb1c79bc68..11475373c66d 100644
--- a/sys/msdosfs/msdosfsmount.h
+++ b/sys/msdosfs/msdosfsmount.h
@@ -13,7 +13,7 @@
  * 
  * October 1992
  * 
- *	$Id: msdosfsmount.h,v 1.1 1993/08/13 11:35:41 cgd Exp $
+ *	$Id: msdosfsmount.h,v 1.2 1994/03/27 09:08:58 cgd Exp $
  */
 
 /*
@@ -124,7 +124,8 @@ int msdosfs_mount __P((struct mount * mp, char *path, caddr_t data, struct namei
 int msdosfs_start __P((struct mount * mp, int flags, struct proc * p));
 int msdosfs_unmount __P((struct mount * mp, int mntflags, struct proc * p));
 int msdosfs_root __P((struct mount * mp, struct vnode ** vpp));
-int msdosfs_quotactl __P((struct mount * mp, int cmds, int uid	/* should be uid_t */, caddr_t arg, struct proc * p));
+int msdosfs_quotactl __P((struct mount * mp, int cmds, uid_t uid, caddr_t arg,
+	struct proc * p));
 int msdosfs_statfs __P((struct mount * mp, struct statfs * sbp, struct proc * p));
 int msdosfs_sync __P((struct mount * mp, int waitfor));
 int msdosfs_fhtovp __P((struct mount * mp, struct fid * fhp, struct vnode ** vpp));