From d9c2f47f02d3238dc46704445f1f6dc0a68fa6f0 Mon Sep 17 00:00:00 2001
From: Mike Karels <karels@ucbvax.Berkeley.EDU>
Date: Fri, 29 Jun 1990 00:12:23 -0800
Subject: [PATCH] RETURN => return, remove syscontext.h

SCCS-vsn: sys/kern/kern_acct.c 7.12
SCCS-vsn: sys/kern/kern_clock.c 7.9
SCCS-vsn: sys/kern/kern_descrip.c 7.15
SCCS-vsn: sys/kern/kern_exec.c 7.28
SCCS-vsn: sys/kern/kern_exit.c 7.25
SCCS-vsn: sys/kern/kern_fork.c 7.18
SCCS-vsn: sys/tahoe/tahoe/machdep.c 7.13
SCCS-vsn: sys/kern/kern_ktrace.c 7.8
SCCS-vsn: sys/tahoe/tahoe/sys_machdep.c 7.5
SCCS-vsn: sys/kern/kern_prot.c 7.12
SCCS-vsn: sys/kern/kern_resource.c 7.9
SCCS-vsn: sys/kern/kern_sig.c 7.22
SCCS-vsn: sys/kern/kern_time.c 7.12
SCCS-vsn: sys/kern/kern_xxx.c 7.13
SCCS-vsn: sys/kern/sys_generic.c 7.21
SCCS-vsn: sys/kern/sys_process.c 7.12
SCCS-vsn: sys/kern/sysv_shm.c 7.9
SCCS-vsn: sys/kern/uipc_syscalls.c 7.18
SCCS-vsn: sys/vax/vax/machdep.c 7.30
SCCS-vsn: sys/kern/vfs_syscalls.c 7.55
SCCS-vsn: sys/vax/vax/sys_machdep.c 7.5
SCCS-vsn: sys/vm/vm_swap.c 7.13
---
 usr/src/sys/kern/kern_acct.c          |  17 ++-
 usr/src/sys/kern/kern_clock.c         |   6 +-
 usr/src/sys/kern/kern_descrip.c       |  66 ++++++------
 usr/src/sys/kern/kern_exec.c          |  12 +--
 usr/src/sys/kern/kern_exit.c          |  27 +++--
 usr/src/sys/kern/kern_fork.c          |  10 +-
 usr/src/sys/kern/kern_ktrace.c        |  14 +--
 usr/src/sys/kern/kern_prot.c          |  86 ++++++++--------
 usr/src/sys/kern/kern_resource.c      |  32 +++---
 usr/src/sys/kern/kern_sig.c           |  54 +++++-----
 usr/src/sys/kern/kern_time.c          |  34 +++---
 usr/src/sys/kern/kern_xxx.c           |  18 ++--
 usr/src/sys/kern/sys_generic.c        |  40 +++----
 usr/src/sys/kern/sys_process.c        |  12 +--
 usr/src/sys/kern/sysv_shm.c           |   8 +-
 usr/src/sys/kern/uipc_syscalls.c      | 143 +++++++++++++-------------
 usr/src/sys/kern/vfs_syscalls.c       |   5 +-
 usr/src/sys/tahoe/tahoe/machdep.c     |  11 +-
 usr/src/sys/tahoe/tahoe/sys_machdep.c |  10 +-
 usr/src/sys/vax/vax/machdep.c         |  10 +-
 usr/src/sys/vax/vax/sys_machdep.c     |  16 +--
 usr/src/sys/vm/vm_swap.c              |  18 ++--
 22 files changed, 322 insertions(+), 327 deletions(-)

diff --git a/usr/src/sys/kern/kern_acct.c b/usr/src/sys/kern/kern_acct.c
index ebc32bcdb3..efd3c1883e 100644
--- a/usr/src/sys/kern/kern_acct.c
+++ b/usr/src/sys/kern/kern_acct.c
@@ -3,7 +3,7 @@
  * All rights reserved.  The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  *
- *	@(#)kern_acct.c	7.11 (Berkeley) %G%
+ *	@(#)kern_acct.c	7.12 (Berkeley) %G%
  */
 
 #include "param.h"
@@ -13,8 +13,7 @@
 #include "ioctl.h"
 #include "termios.h"
 #include "tty.h"
-#undef RETURN
-#include "syscontext.h"
+#include "user.h"
 #include "vnode.h"
 #include "mount.h"
 #include "kernel.h"
@@ -53,7 +52,7 @@ sysacct(p, uap, retval)
 	int error;
 
 	if (error = suser(u.u_cred, &u.u_acflag))
-		RETURN (error);
+		return (error);
 	if (savacctp) {
 		acctp = savacctp;
 		savacctp = NULL;
@@ -64,28 +63,28 @@ sysacct(p, uap, retval)
 			vrele(vp);
 			untimeout(acctwatch, (caddr_t)&chk);
 		}
-		RETURN (0);
+		return (0);
 	}
 	ndp->ni_nameiop = LOOKUP | FOLLOW;
 	ndp->ni_segflg = UIO_USERSPACE;
 	ndp->ni_dirp = uap->fname;
 	if (error = namei(ndp))
-		RETURN (error);
+		return (error);
 	vp = ndp->ni_vp;
 	if (vp->v_type != VREG) {
 		vrele(vp);
-		RETURN (EACCES);
+		return (EACCES);
 	}
 	if (vp->v_mount->mnt_flag & MNT_RDONLY) {
 		vrele(vp);
-		RETURN (EROFS);
+		return (EROFS);
 	}
 	oacctp = acctp;
 	acctp = vp;
 	if (oacctp)
 		vrele(oacctp);
 	acctwatch(&chk);
-	RETURN (0);
+	return (0);
 }
 
 /*
diff --git a/usr/src/sys/kern/kern_clock.c b/usr/src/sys/kern/kern_clock.c
index 52c71cee01..c1afd2dd5c 100644
--- a/usr/src/sys/kern/kern_clock.c
+++ b/usr/src/sys/kern/kern_clock.c
@@ -3,14 +3,14 @@
  * All rights reserved.  The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  *
- *	@(#)kern_clock.c	7.8 (Berkeley) %G%
+ *	@(#)kern_clock.c	7.9 (Berkeley) %G%
  */
 
 #include "param.h"
 #include "systm.h"
 #include "dkstat.h"
 #include "callout.h"
-#include "syscontext.h"
+#include "user.h"
 #include "kernel.h"
 #include "proc.h"
 #include "vm.h"
@@ -447,5 +447,5 @@ profil(p, uap, retval)
 	upp->pr_size = uap->bufsize;
 	upp->pr_off = uap->pcoffset;
 	upp->pr_scale = uap->pcscale;
-	RETURN (0);
+	return (0);
 }
diff --git a/usr/src/sys/kern/kern_descrip.c b/usr/src/sys/kern/kern_descrip.c
index c06c6ce61f..8b270ce4b0 100644
--- a/usr/src/sys/kern/kern_descrip.c
+++ b/usr/src/sys/kern/kern_descrip.c
@@ -14,12 +14,12 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- *	@(#)kern_descrip.c	7.14 (Berkeley) %G%
+ *	@(#)kern_descrip.c	7.15 (Berkeley) %G%
  */
 
 #include "param.h"
 #include "systm.h"
-#include "syscontext.h"
+#include "user.h"
 #include "kernel.h"
 #include "vnode.h"
 #include "proc.h"
@@ -44,7 +44,7 @@ getdtablesize(p, uap, retval)
 {
 
 	*retval = NOFILE;
-	RETURN (0);
+	return (0);
 }
 
 /*
@@ -64,19 +64,19 @@ dup(p, uap, retval)
 	/*
 	 * XXX Compatibility
 	 */
-	if (uap->i &~ 077) { uap->i &= 077; RETURN (dup2(p, uap, retval)); }
+	if (uap->i &~ 077) { uap->i &= 077; return (dup2(p, uap, retval)); }
 
 	if ((unsigned)uap->i >= NOFILE || (fp = u.u_ofile[uap->i]) == NULL)
-		RETURN (EBADF);
+		return (EBADF);
 	if (error = ufalloc(0, &fd))
-		RETURN (error);
+		return (error);
 	u.u_ofile[fd] = fp;
 	u.u_pofile[fd] = u.u_pofile[uap->i] &~ UF_EXCLOSE;
 	fp->f_count++;
 	if (fd > u.u_lastfile)
 		u.u_lastfile = fd;
 	*retval = fd;
-	RETURN (0);
+	return (0);
 }
 
 /*
@@ -95,12 +95,12 @@ dup2(p, uap, retval)
 	int error;
 
 	if ((unsigned)uap->i >= NOFILE || (fp = u.u_ofile[uap->i]) == NULL)
-		RETURN (EBADF);
+		return (EBADF);
 	if (uap->j < 0 || uap->j >= NOFILE)
-		RETURN (EBADF);
+		return (EBADF);
 	*retval = uap->j;
 	if (uap->i == uap->j)
-		RETURN (0);
+		return (0);
 	if (u.u_ofile[uap->j]) {
 		if (u.u_pofile[uap->j] & UF_MAPPED)
 			munmapfd(uap->j);
@@ -115,7 +115,7 @@ dup2(p, uap, retval)
 	 * dup2() must succeed even though the close had an error.
 	 */
 	error = 0;		/* XXX */
-	RETURN (error);
+	return (error);
 }
 
 /*
@@ -137,51 +137,51 @@ fcntl(p, uap, retval)
 
 	if ((unsigned)uap->fdes >= NOFILE ||
 	    (fp = u.u_ofile[uap->fdes]) == NULL)
-		RETURN (EBADF);
+		return (EBADF);
 	pop = &u.u_pofile[uap->fdes];
 	switch(uap->cmd) {
 	case F_DUPFD:
 		if (uap->arg < 0 || uap->arg >= NOFILE)
-			RETURN (EINVAL);
+			return (EINVAL);
 		if (error = ufalloc(uap->arg, &i))
-			RETURN (error);
+			return (error);
 		u.u_ofile[i] = fp;
 		u.u_pofile[i] = *pop &~ UF_EXCLOSE;
 		fp->f_count++;
 		if (i > u.u_lastfile)
 			u.u_lastfile = i;
 		*retval = i;
-		RETURN (0);
+		return (0);
 
 	case F_GETFD:
 		*retval = *pop & 1;
-		RETURN (0);
+		return (0);
 
 	case F_SETFD:
 		*pop = (*pop &~ 1) | (uap->arg & 1);
-		RETURN (0);
+		return (0);
 
 	case F_GETFL:
 		*retval = fp->f_flag + FOPEN;
-		RETURN (0);
+		return (0);
 
 	case F_SETFL:
 		fp->f_flag &= FCNTLCANT;
 		fp->f_flag |= (uap->arg-FOPEN) &~ FCNTLCANT;
 		if (error = fset(fp, FNDELAY, fp->f_flag & FNDELAY))
-			RETURN (error);
+			return (error);
 		if (error = fset(fp, FASYNC, fp->f_flag & FASYNC))
 			(void) fset(fp, FNDELAY, 0);
-		RETURN (error);
+		return (error);
 
 	case F_GETOWN:
-		RETURN (fgetown(fp, retval));
+		return (fgetown(fp, retval));
 
 	case F_SETOWN:
-		RETURN (fsetown(fp, uap->arg));
+		return (fsetown(fp, uap->arg));
 
 	default:
-		RETURN (EINVAL);
+		return (EINVAL);
 	}
 	/* NOTREACHED */
 }
@@ -262,7 +262,7 @@ close(p, uap, retval)
 
 	if ((unsigned)uap->fdes >= NOFILE ||
 	    (fp = u.u_ofile[uap->fdes]) == NULL)
-		RETURN (EBADF);
+		return (EBADF);
 	pf = (u_char *)&u.u_pofile[uap->fdes];
 	if (*pf & UF_MAPPED)
 		munmapfd(uap->fdes);
@@ -270,7 +270,7 @@ close(p, uap, retval)
 	while (u.u_lastfile >= 0 && u.u_ofile[u.u_lastfile] == NULL)
 		u.u_lastfile--;
 	*pf = 0;
-	RETURN (closef(fp));
+	return (closef(fp));
 }
 
 /*
@@ -291,7 +291,7 @@ fstat(p, uap, retval)
 
 	if ((unsigned)uap->fdes >= NOFILE ||
 	    (fp = u.u_ofile[uap->fdes]) == NULL)
-		RETURN (EBADF);
+		return (EBADF);
 	switch (fp->f_type) {
 
 	case DTYPE_VNODE:
@@ -308,7 +308,7 @@ fstat(p, uap, retval)
 	}
 	if (error == 0)
 		error = copyout((caddr_t)&ub, (caddr_t)uap->sb, sizeof (ub));
-	RETURN (error);
+	return (error);
 }
 
 /*
@@ -424,22 +424,22 @@ flock(p, uap, retval)
 
 	if ((unsigned)uap->fdes >= NOFILE ||
 	    (fp = u.u_ofile[uap->fdes]) == NULL)
-		RETURN (EBADF);
+		return (EBADF);
 	if (fp->f_type != DTYPE_VNODE)
-		RETURN (EOPNOTSUPP);
+		return (EOPNOTSUPP);
 	if (uap->how & LOCK_UN) {
 		vn_unlock(fp, FSHLOCK|FEXLOCK);
-		RETURN (0);
+		return (0);
 	}
 	if ((uap->how & (LOCK_SH | LOCK_EX)) == 0)
-		RETURN (0);				/* error? */
+		return (0);				/* error? */
 	if (uap->how & LOCK_EX)
 		uap->how &= ~LOCK_SH;
 	/* avoid work... */
 	if ((fp->f_flag & FEXLOCK) && (uap->how & LOCK_EX) ||
 	    (fp->f_flag & FSHLOCK) && (uap->how & LOCK_SH))
-		RETURN (0);
-	RETURN (vn_lock(fp, uap->how));
+		return (0);
+	return (vn_lock(fp, uap->how));
 }
 
 /*
diff --git a/usr/src/sys/kern/kern_exec.c b/usr/src/sys/kern/kern_exec.c
index 660881aa1d..23d785577d 100644
--- a/usr/src/sys/kern/kern_exec.c
+++ b/usr/src/sys/kern/kern_exec.c
@@ -14,13 +14,13 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- *	@(#)kern_exec.c	7.27 (Berkeley) %G%
+ *	@(#)kern_exec.c	7.28 (Berkeley) %G%
  */
 
 #include "param.h"
 #include "systm.h"
 #include "map.h"
-#include "syscontext.h"
+#include "user.h"
 #include "kernel.h"
 #include "proc.h"
 #include "mount.h"
@@ -59,7 +59,7 @@ execv(p, uap, retval)
 {
 
 	uap->envp = NULL;
-	RETURN (execve(p, uap, retval));
+	return (execve(p, uap, retval));
 }
 
 /* ARGSUSED */
@@ -107,7 +107,7 @@ execve(p, uap, retval)
 	ndp->ni_segflg = UIO_USERSPACE;
 	ndp->ni_dirp = uap->fname;
 	if (error = namei(ndp))
-		RETURN (error);
+		return (error);
 	vp = ndp->ni_vp;
 	bno = 0;
 	bp = 0;
@@ -282,7 +282,7 @@ execve(p, uap, retval)
 		ndp->ni_nameiop = LOOKUP | FOLLOW | LOCKLEAF;
 		ndp->ni_segflg = UIO_SYSSPACE;
 		if (error = namei(ndp))
-			RETURN (error);
+			return (error);
 		vp = ndp->ni_vp;
 		if (error = VOP_GETATTR(vp, &vattr, cred))
 			goto bad;
@@ -528,7 +528,7 @@ bad:
 #endif SECSIZE
 	if (vp)
 		vput(vp);
-	RETURN (error);
+	return (error);
 }
 
 /*
diff --git a/usr/src/sys/kern/kern_exit.c b/usr/src/sys/kern/kern_exit.c
index 37c540e051..2ffa627e8a 100644
--- a/usr/src/sys/kern/kern_exit.c
+++ b/usr/src/sys/kern/kern_exit.c
@@ -14,7 +14,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- *	@(#)kern_exit.c	7.24 (Berkeley) %G%
+ *	@(#)kern_exit.c	7.25 (Berkeley) %G%
  */
 
 #include "param.h"
@@ -22,8 +22,7 @@
 #include "map.h"
 #include "ioctl.h"
 #include "tty.h"
-#undef RETURN
-#include "syscontext.h"
+#include "user.h"
 #include "kernel.h"
 #include "proc.h"
 #include "buf.h"
@@ -51,7 +50,7 @@ rexit(p, uap, retval)
 	int *retval;
 {
 
-	RETURN (exit(p, W_EXITCODE(uap->rval, 0)));
+	return (exit(p, W_EXITCODE(uap->rval, 0)));
 }
 
 /*
@@ -246,7 +245,7 @@ owait(p, uap, retval)
 	uap->pid = WAIT_ANY;
 	uap->status = 0;
 	uap->compat = 1;
-	RETURN (wait1(p, uap, retval));
+	return (wait1(p, uap, retval));
 }
 
 wait4(p, uap, retval)
@@ -262,7 +261,7 @@ wait4(p, uap, retval)
 {
 
 	uap->compat = 0;
-	RETURN (wait1(p, uap, retval));
+	return (wait1(p, uap, retval));
 }
 #else
 #define	wait1	wait4
@@ -296,7 +295,7 @@ wait1(q, uap, retval)
 		uap->pid = -q->p_pgid;
 #ifdef notyet
 	if (uap->options &~ (WUNTRACED|WNOHANG))
-		RETURN (EINVAL);
+		return (EINVAL);
 #endif
 loop:
 	f = 0;
@@ -316,11 +315,11 @@ loop:
 				status = p->p_xstat;	/* convert to int */
 				if (error = copyout((caddr_t)&status,
 				    (caddr_t)uap->status, sizeof(status)))
-					RETURN (error);
+					return (error);
 			}
 			if (uap->rusage && (error = copyout((caddr_t)p->p_ru,
 			    (caddr_t)uap->rusage, sizeof (struct rusage))))
-				RETURN (error);
+				return (error);
 			pgrm(p);			/* off pgrp */
 			p->p_xstat = 0;
 			ruadd(&u.u_cru, p->p_ru);
@@ -350,7 +349,7 @@ loop:
 			/*p->p_pgrp = 0;*/
 			p->p_flag = 0;
 			p->p_wchan = 0;
-			RETURN (0);
+			return (0);
 		}
 		if (p->p_stat == SSTOP && (p->p_flag & SWTED) == 0 &&
 		    (p->p_flag & STRC || uap->options & WUNTRACED)) {
@@ -368,16 +367,16 @@ loop:
 				    (caddr_t)uap->status, sizeof(status));
 			} else
 				error = 0;
-			RETURN (error);
+			return (error);
 		}
 	}
 	if (f == 0)
-		RETURN (ECHILD);
+		return (ECHILD);
 	if (uap->options & WNOHANG) {
 		retval[0] = 0;
-		RETURN (0);
+		return (0);
 	}
 	if (error = tsleep((caddr_t)q, PWAIT | PCATCH, "wait", 0))
-		RETURN (error);
+		return (error);
 	goto loop;
 }
diff --git a/usr/src/sys/kern/kern_fork.c b/usr/src/sys/kern/kern_fork.c
index 187529be38..bb0566ca27 100644
--- a/usr/src/sys/kern/kern_fork.c
+++ b/usr/src/sys/kern/kern_fork.c
@@ -14,13 +14,13 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- *	@(#)kern_fork.c	7.17 (Berkeley) %G%
+ *	@(#)kern_fork.c	7.18 (Berkeley) %G%
  */
 
 #include "param.h"
 #include "systm.h"
 #include "map.h"
-#include "syscontext.h"
+#include "user.h"
 #include "kernel.h"
 #include "proc.h"
 #include "vnode.h"
@@ -51,9 +51,9 @@ fork(p, uap, retval)
 	u.u_csmap = zdmap;
 	if (error = swpexpand(u.u_dsize, u.u_ssize, &u.u_cdmap, &u.u_csmap)) {
 		retval[1] = 0;
-		RETURN (error);
+		return (error);
 	}
-	RETURN (fork1(p, 0, retval));
+	return (fork1(p, 0, retval));
 }
 
 /* ARGSUSED */
@@ -63,7 +63,7 @@ vfork(p, uap, retval)
 	int retval[];
 {
 
-	RETURN (fork1(p, 1, retval));
+	return (fork1(p, 1, retval));
 }
 
 fork1(p1, isvfork, retval)
diff --git a/usr/src/sys/kern/kern_ktrace.c b/usr/src/sys/kern/kern_ktrace.c
index 127e349b7b..cd1b6925ec 100644
--- a/usr/src/sys/kern/kern_ktrace.c
+++ b/usr/src/sys/kern/kern_ktrace.c
@@ -14,13 +14,13 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- *	@(#)kern_ktrace.c	7.7 (Berkeley) %G%
+ *	@(#)kern_ktrace.c	7.8 (Berkeley) %G%
  */
 
 #ifdef KTRACE
 
 #include "param.h"
-#include "syscontext.h"
+#include "user.h"
 #include "proc.h"
 #include "file.h"
 #include "vnode.h"
@@ -193,7 +193,7 @@ ktrace(curp, uap, retval)
 	 * limit tracing to root (unless ktrace_nocheck is set).
 	 */
 	if (!ktrace_nocheck && (error = suser(u.u_cred, &u.u_acflag)))
-		RETURN (error);
+		return (error);
 	if (ops != KTROP_CLEAR) {
 		/*
 		 * an operation which requires a file argument.
@@ -201,11 +201,11 @@ ktrace(curp, uap, retval)
 		ndp->ni_segflg = UIO_USERSPACE;
 		ndp->ni_dirp = uap->fname;
 		if (error = vn_open(ndp, FREAD|FWRITE, 0))
-			RETURN (error);
+			return (error);
 		vp = ndp->ni_vp;
 		if (vp->v_type != VREG) {
 			vrele(vp);
-			RETURN (EACCES);
+			return (EACCES);
 		}
 	}
 	/*
@@ -259,7 +259,7 @@ ktrace(curp, uap, retval)
 done:
 	if (vp != NULL)
 		vrele(vp);
-	RETURN (error);
+	return (error);
 }
 
 ktrops(p, ops, facs, vp)
@@ -268,7 +268,7 @@ ktrops(p, ops, facs, vp)
 {
 
 	if (u.u_uid && u.u_uid != p->p_uid)
-		return 0;
+		return (0);
 	if (ops == KTROP_SET) {
 		if (p->p_tracep != vp) { 
 			/*
diff --git a/usr/src/sys/kern/kern_prot.c b/usr/src/sys/kern/kern_prot.c
index c1dc5f978a..f290b040c2 100644
--- a/usr/src/sys/kern/kern_prot.c
+++ b/usr/src/sys/kern/kern_prot.c
@@ -14,7 +14,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- *	@(#)kern_prot.c	7.11 (Berkeley) %G%
+ *	@(#)kern_prot.c	7.12 (Berkeley) %G%
  */
 
 /*
@@ -24,7 +24,7 @@
 #include "param.h"
 #include "acct.h"
 #include "systm.h"
-#include "syscontext.h"
+#include "user.h"
 #include "proc.h"
 #include "timeb.h"
 #include "times.h"
@@ -41,7 +41,7 @@ getpid(p, uap, retval)
 #ifdef COMPAT_43
 	retval[1] = p->p_ppid;
 #endif
-	RETURN (0);
+	return (0);
 }
 
 /* ARGSUSED */
@@ -52,7 +52,7 @@ getppid(p, uap, retval)
 {
 
 	*retval = p->p_ppid;
-	RETURN (0);
+	return (0);
 }
 
 getpgrp(p, uap, retval)
@@ -64,9 +64,9 @@ getpgrp(p, uap, retval)
 {
 
 	if (uap->pid != 0 && (p = pfind(uap->pid)) == 0)
-		RETURN (ESRCH);
+		return (ESRCH);
 	*retval = p->p_pgrp->pg_id;
-	RETURN (0);
+	return (0);
 }
 
 /* ARGSUSED */
@@ -80,7 +80,7 @@ getuid(p, uap, retval)
 #ifdef COMPAT_43
 	retval[1] = u.u_cred->cr_uid;
 #endif
-	RETURN (0);
+	return (0);
 }
 
 /* ARGSUSED */
@@ -91,7 +91,7 @@ geteuid(p, uap, retval)
 {
 
 	*retval = u.u_cred->cr_uid;
-	RETURN (0);
+	return (0);
 }
 
 /* ARGSUSED */
@@ -105,7 +105,7 @@ getgid(p, uap, retval)
 #ifdef COMPAT_43
 	retval[1] = u.u_cred->cr_groups[0];
 #endif
-	RETURN (0);
+	return (0);
 }
 
 /*
@@ -122,7 +122,7 @@ getegid(p, uap, retval)
 {
 
 	*retval = u.u_cred->cr_groups[0];
-	RETURN (0);
+	return (0);
 }
 
 getgroups(p, uap, retval)
@@ -140,19 +140,19 @@ getgroups(p, uap, retval)
 
 	if (uap->gidsetsize == 0) {
 		*retval = u.u_cred->cr_ngroups;
-		RETURN (0);
+		return (0);
 	}
 	if (uap->gidsetsize < u.u_cred->cr_ngroups)
-		RETURN (EINVAL);
+		return (EINVAL);
 	uap->gidsetsize = u.u_cred->cr_ngroups;
 	gp = u.u_cred->cr_groups;
 	for (lp = groups; lp < &groups[uap->gidsetsize]; )
 		*lp++ = *gp++;
 	if (error = copyout((caddr_t)groups, (caddr_t)uap->gidset,
 	    uap->gidsetsize * sizeof (groups[0])))
-		RETURN (error);
+		return (error);
 	*retval = uap->gidsetsize;
-	RETURN (0);
+	return (0);
 }
 
 /* ARGSUSED */
@@ -163,11 +163,11 @@ setsid(p, uap, retval)
 {
 
 	if (p->p_pgid == p->p_pid || pgfind(p->p_pid)) {
-		RETURN (EPERM);
+		return (EPERM);
 	} else {
 		pgmv(p, p->p_pid, 1);
 		*retval = p->p_pid;
-		RETURN (0);
+		return (0);
 	}
 }
 
@@ -198,27 +198,27 @@ setpgrp(cp, uap, retval)
 
 	if (uap->pid != 0) {
 		if ((p = pfind(uap->pid)) == 0 || !inferior(p))
-			RETURN (ESRCH);
+			return (ESRCH);
 		if (p->p_session != cp->p_session)
-			RETURN (EPERM);
+			return (EPERM);
 		if (p->p_flag&SEXEC)
-			RETURN (EACCES);
+			return (EACCES);
 	} else
 		p = cp;
 	if (SESS_LEADER(p))
-		RETURN (EPERM);
+		return (EPERM);
 	if (uap->pgid == 0)
 		uap->pgid = p->p_pid;
 	else if ((uap->pgid != p->p_pid) &&
 		(((pgrp = pgfind(uap->pgid)) == 0) || 
 		   pgrp->pg_mem == NULL ||
 	           pgrp->pg_session != u.u_procp->p_session))
-		RETURN (EPERM);
+		return (EPERM);
 	/*
 	 * done checking, now do it
 	 */
 	pgmv(p, uap->pgid, 0);
-	RETURN (0);
+	return (0);
 }
 
 /* ARGSUSED */
@@ -234,7 +234,7 @@ setuid(p, uap, retval)
 
 	uid = uap->uid;
 	if (uid != p->p_ruid && (error = suser(u.u_cred, &u.u_acflag)))
-		RETURN (error);
+		return (error);
 	/*
 	 * Everything's okay, do it.
 	 * Copy credentials so other references do not
@@ -246,7 +246,7 @@ setuid(p, uap, retval)
 	p->p_uid = uid;
 	p->p_ruid = uid;
 	p->p_svuid = uid;
-	RETURN (0);
+	return (0);
 }
 
 /* ARGSUSED */
@@ -263,7 +263,7 @@ seteuid(p, uap, retval)
 	euid = uap->euid;
 	if (euid != p->p_ruid && euid != p->p_svuid &&
 	    (error = suser(u.u_cred, &u.u_acflag)))
-		RETURN (error);
+		return (error);
 	/*
 	 * Everything's okay, do it.
 	 * Copy credentials so other references do not
@@ -273,7 +273,7 @@ seteuid(p, uap, retval)
 		u.u_cred = crcopy(u.u_cred);
 	u.u_cred->cr_uid = euid;
 	p->p_uid = euid;
-	RETURN (0);
+	return (0);
 }
 
 /* ARGSUSED */
@@ -289,13 +289,13 @@ setgid(p, uap, retval)
 
 	gid = uap->gid;
 	if (gid != p->p_rgid && (error = suser(u.u_cred, &u.u_acflag)))
-		RETURN (error);
+		return (error);
 	if (u.u_cred->cr_ref > 1)
 		u.u_cred = crcopy(u.u_cred);
 	p->p_rgid = gid;
 	u.u_cred->cr_groups[0] = gid;
 	p->p_svgid = gid;		/* ??? */
-	RETURN (0);
+	return (0);
 }
 
 /* ARGSUSED */
@@ -312,11 +312,11 @@ setegid(p, uap, retval)
 	egid = uap->egid;
 	if (egid != p->p_rgid && egid != p->p_svgid &&
 	    (error = suser(u.u_cred, &u.u_acflag)))
-		RETURN (error);
+		return (error);
 	if (u.u_cred->cr_ref > 1)
 		u.u_cred = crcopy(u.u_cred);
 	u.u_cred->cr_groups[0] = egid;
-	RETURN (0);
+	return (0);
 }
 
 #ifdef COMPAT_43
@@ -334,10 +334,10 @@ osetreuid(p, uap, retval)
 
 	if (uap->ruid == -1)
 	    (error = suser(u.u_cred, &u.u_acflag)))
-		RETURN (error);
+		return (error);
 	if (uap->euid == -1)
 	    euid != p->p_svuid && (error = suser(u.u_cred, &u.u_acflag)))
-		RETURN (error);
+		return (error);
 	/*
 	 * Everything's okay, do it.
 	 * Copy credentials so other references do not
@@ -348,7 +348,7 @@ osetreuid(p, uap, retval)
 	u.u_cred->cr_uid = euid;
 	p->p_uid = euid;
 	p->p_ruid = ruid;
-	RETURN (0);
+	return (0);
 }
 
 /* ARGSUSED */
@@ -365,15 +365,15 @@ osetregid(p, uap, retval)
 
 	if (uap->rgid == -1)
 	    (error = suser(u.u_cred, &u.u_acflag)))
-		RETURN (error);
+		return (error);
 	if (uap->egid == -1)
 	    egid != p->p_svgid && (error = suser(u.u_cred, &u.u_acflag)))
-		RETURN (error);
+		return (error);
 	if (u.u_cred->cr_ref > 1)
 		u.u_cred = crcopy(u.u_cred);
 	p->p_rgid = rgid;
 	u.u_cred->cr_groups[0] = egid;
-	RETURN (0);
+	return (0);
 }
 #endif
 
@@ -391,19 +391,19 @@ setgroups(p, uap, retval)
 	int error, ngrp, groups[NGROUPS];
 
 	if (error = suser(u.u_cred, &u.u_acflag))
-		RETURN (error);
+		return (error);
 	ngrp = uap->gidsetsize;
 	if (ngrp > NGROUPS)
-		RETURN (EINVAL);
+		return (EINVAL);
 	error = copyin((caddr_t)uap->gidset, (caddr_t)groups,
 	    uap->gidsetsize * sizeof (groups[0]));
 	if (error)
-		RETURN (error);
+		return (error);
 	gp = u.u_cred->cr_groups;
 	for (lp = groups; lp < &groups[uap->gidsetsize]; )
 		*gp++ = *lp++;
 	u.u_cred->cr_ngroups = ngrp;
-	RETURN (0);
+	return (0);
 }
 
 /*
@@ -516,7 +516,7 @@ getlogin(p, uap, retval)
 
 	if (uap->namelen > sizeof (p->p_logname))
 		uap->namelen = sizeof (p->p_logname);
-	RETURN (copyout((caddr_t)p->p_logname, (caddr_t)uap->namebuf,
+	return (copyout((caddr_t)p->p_logname, (caddr_t)uap->namebuf,
 	    uap->namelen));
 }
 
@@ -534,10 +534,10 @@ setlogin(p, uap, retval)
 	int error;
 
 	if (error = suser(u.u_cred, &u.u_acflag))
-		RETURN (error);
+		return (error);
 	error = copyinstr((caddr_t)uap->namebuf, (caddr_t)p->p_logname,
 	    sizeof (p->p_logname) - 1, (int *) 0);
 	if (error == ENOENT)		/* name too long */
 		error = EINVAL;
-	RETURN (error);
+	return (error);
 }
diff --git a/usr/src/sys/kern/kern_resource.c b/usr/src/sys/kern/kern_resource.c
index d8231027d9..d19db59e36 100644
--- a/usr/src/sys/kern/kern_resource.c
+++ b/usr/src/sys/kern/kern_resource.c
@@ -3,11 +3,11 @@
  * All rights reserved.  The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  *
- *	@(#)kern_resource.c	7.8 (Berkeley) %G%
+ *	@(#)kern_resource.c	7.9 (Berkeley) %G%
  */
 
 #include "param.h"
-#include "syscontext.h"
+#include "user.h"
 #include "proc.h"
 
 /*
@@ -62,12 +62,12 @@ getpriority(curp, uap, retval)
 		break;
 
 	default:
-		RETURN (EINVAL);
+		return (EINVAL);
 	}
 	if (low == PRIO_MAX + 1)
-		RETURN (ESRCH);
+		return (ESRCH);
 	*retval = low;
-	RETURN (0);
+	return (0);
 }
 
 /* ARGSUSED */
@@ -121,11 +121,11 @@ setpriority(curp, uap, retval)
 		break;
 
 	default:
-		RETURN (EINVAL);
+		return (EINVAL);
 	}
 	if (found == 0)
-		RETURN (ESRCH);
-	RETURN (0);
+		return (ESRCH);
+	return (0);
 }
 
 donice(curp, chgp, n)
@@ -162,14 +162,14 @@ setrlimit(p, uap, retval)
 	int error;
 
 	if (uap->which >= RLIM_NLIMITS)
-		RETURN (EINVAL);
+		return (EINVAL);
 	alimp = &u.u_rlimit[uap->which];
 	if (error =
 	    copyin((caddr_t)uap->lim, (caddr_t)&alim, sizeof (struct rlimit)))
-		RETURN (error);
+		return (error);
 	if (alim.rlim_cur > alimp->rlim_max || alim.rlim_max > alimp->rlim_max)
 		if (error = suser(u.u_cred, &u.u_acflag))
-			RETURN (error);
+			return (error);
 	switch (uap->which) {
 
 	case RLIMIT_DATA:
@@ -189,7 +189,7 @@ setrlimit(p, uap, retval)
 	*alimp = alim;
 	if (uap->which == RLIMIT_RSS)
 		p->p_maxrss = alim.rlim_cur/NBPG;
-	RETURN (0);
+	return (0);
 }
 
 /* ARGSUSED */
@@ -203,8 +203,8 @@ getrlimit(p, uap, retval)
 {
 
 	if (uap->which >= RLIM_NLIMITS)
-		RETURN (EINVAL);
-	RETURN (copyout((caddr_t)&u.u_rlimit[uap->which], (caddr_t)uap->rlp,
+		return (EINVAL);
+	return (copyout((caddr_t)&u.u_rlimit[uap->which], (caddr_t)uap->rlp,
 	    sizeof (struct rlimit)));
 }
 
@@ -237,9 +237,9 @@ getrusage(p, uap, retval)
 		break;
 
 	default:
-		RETURN (EINVAL);
+		return (EINVAL);
 	}
-	RETURN (copyout((caddr_t)rup, (caddr_t)uap->rusage,
+	return (copyout((caddr_t)rup, (caddr_t)uap->rusage,
 	    sizeof (struct rusage)));
 }
 
diff --git a/usr/src/sys/kern/kern_sig.c b/usr/src/sys/kern/kern_sig.c
index b65d8333d5..6cf7c642af 100644
--- a/usr/src/sys/kern/kern_sig.c
+++ b/usr/src/sys/kern/kern_sig.c
@@ -14,12 +14,12 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- *	@(#)kern_sig.c	7.21 (Berkeley) %G%
+ *	@(#)kern_sig.c	7.22 (Berkeley) %G%
  */
 
 #include "param.h"
 #include "systm.h"
-#include "syscontext.h"	/* XXX */
+#include "user.h"
 #include "vnode.h"
 #include "proc.h"
 #include "timeb.h"
@@ -71,7 +71,7 @@ sigaction(p, uap, retval)
 
 	sig = uap->signo;
 	if (sig <= 0 || sig >= NSIG || sig == SIGKILL || sig == SIGSTOP)
-		RETURN (EINVAL);
+		return (EINVAL);
 	sa = &vec;
 	if (uap->osa) {
 		sa->sa_handler = u.u_signal[sig];
@@ -86,15 +86,15 @@ sigaction(p, uap, retval)
 			sa->sa_flags |= SA_NOCLDSTOP;
 		if (error = copyout((caddr_t)sa, (caddr_t)uap->osa,
 		    sizeof (vec)))
-			RETURN (error);
+			return (error);
 	}
 	if (uap->nsa) {
 		if (error = copyin((caddr_t)uap->nsa, (caddr_t)sa,
 		    sizeof (vec)))
-			RETURN (error);
+			return (error);
 		setsigvec(p, sig, sa);
 	}
-	RETURN (0);
+	return (0);
 }
 
 setsigvec(p, sig, sa)
@@ -228,7 +228,7 @@ sigprocmask(p, uap, retval)
 		break;
 	}
 	(void) spl0();
-	RETURN (error);
+	return (error);
 }
 
 /* ARGSUSED */
@@ -239,7 +239,7 @@ sigpending(p, uap, retval)
 {
 
 	*retval = p->p_sig;
-	RETURN (0);
+	return (0);
 }
 
 #ifdef COMPAT_43
@@ -263,7 +263,7 @@ osigvec(p, uap, retval)
 
 	sig = uap->signo;
 	if (sig <= 0 || sig >= NSIG || sig == SIGKILL || sig == SIGSTOP)
-		RETURN (EINVAL);
+		return (EINVAL);
 	sv = &vec;
 	if (uap->osv) {
 		*(sig_t *)&sv->sv_handler = u.u_signal[sig];
@@ -278,16 +278,16 @@ osigvec(p, uap, retval)
 			sv->sv_flags |= SA_NOCLDSTOP;
 		if (error = copyout((caddr_t)sv, (caddr_t)uap->osv,
 		    sizeof (vec)))
-			RETURN (error);
+			return (error);
 	}
 	if (uap->nsv) {
 		if (error = copyin((caddr_t)uap->nsv, (caddr_t)sv,
 		    sizeof (vec)))
-			RETURN (error);
+			return (error);
 		sv->sv_flags ^= SA_RESTART;	/* opposite of SV_INTERRUPT */
 		setsigvec(p, sig, (struct sigaction *)sv);
 	}
-	RETURN (0);
+	return (0);
 }
 
 osigblock(p, uap, retval)
@@ -302,7 +302,7 @@ osigblock(p, uap, retval)
 	*retval = p->p_sigmask;
 	p->p_sigmask |= uap->mask &~ sigcantmask;
 	(void) spl0();
-	RETURN (0);
+	return (0);
 }
 
 osigsetmask(p, uap, retval)
@@ -317,7 +317,7 @@ osigsetmask(p, uap, retval)
 	*retval = p->p_sigmask;
 	p->p_sigmask = uap->mask &~ sigcantmask;
 	(void) spl0();
-	RETURN (0);
+	return (0);
 }
 #endif
 
@@ -347,7 +347,7 @@ sigsuspend(p, uap, retval)
 	p->p_sigmask = uap->mask &~ sigcantmask;
 	(void) tsleep((caddr_t)&u, PPAUSE | PCATCH, "pause", 0);
 	/* always return EINTR rather than ERESTART... */
-	RETURN (EINTR);
+	return (EINTR);
 }
 
 /* ARGSUSED */
@@ -364,11 +364,11 @@ sigstack(p, uap, retval)
 
 	if (uap->oss && (error = copyout((caddr_t)&u.u_sigstack,
 	    (caddr_t)uap->oss, sizeof (struct sigstack))))
-		RETURN (error);
+		return (error);
 	if (uap->nss && (error = copyin((caddr_t)uap->nss, (caddr_t)&ss,
 	    sizeof (ss))) == 0)
 		u.u_sigstack = ss;
-	RETURN (error);
+	return (error);
 }
 
 /* ARGSUSED */
@@ -383,25 +383,25 @@ kill(cp, uap, retval)
 	register struct proc *p;
 
 	if ((unsigned) uap->signo >= NSIG)
-		RETURN (EINVAL);
+		return (EINVAL);
 	if (uap->pid > 0) {
 		/* kill single process */
 		p = pfind(uap->pid);
 		if (p == 0)
-			RETURN (ESRCH);
+			return (ESRCH);
 		if (!CANSIGNAL(cp, p, uap->signo))
-			RETURN (EPERM);
+			return (EPERM);
 		if (uap->signo)
 			psignal(p, uap->signo);
-		RETURN (0);
+		return (0);
 	}
 	switch (uap->pid) {
 	case -1:		/* broadcast signal */
-		RETURN (killpg1(cp, uap->signo, 0, 1));
+		return (killpg1(cp, uap->signo, 0, 1));
 	case 0:			/* signal own process group */
-		RETURN (killpg1(cp, uap->signo, 0, 0));
+		return (killpg1(cp, uap->signo, 0, 0));
 	default:		/* negative explicit process group */
-		RETURN (killpg1(cp, uap->signo, -uap->pid, 0));
+		return (killpg1(cp, uap->signo, -uap->pid, 0));
 	}
 	/* NOTREACHED */
 }
@@ -418,8 +418,8 @@ okillpg(p, uap, retval)
 {
 
 	if ((unsigned) uap->signo >= NSIG)
-		RETURN (EINVAL);
-	RETURN (killpg1(p, uap->signo, uap->pgid, 0));
+		return (EINVAL);
+	return (killpg1(p, uap->signo, uap->pgid, 0));
 }
 #endif
 
@@ -1040,5 +1040,5 @@ nosys(p, args, retval)
 {
 
 	psignal(p, SIGSYS);
-	RETURN (EINVAL);
+	return (EINVAL);
 }
diff --git a/usr/src/sys/kern/kern_time.c b/usr/src/sys/kern/kern_time.c
index 7896e17c41..a94ab776cb 100644
--- a/usr/src/sys/kern/kern_time.c
+++ b/usr/src/sys/kern/kern_time.c
@@ -14,11 +14,11 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- *	@(#)kern_time.c	7.11 (Berkeley) %G%
+ *	@(#)kern_time.c	7.12 (Berkeley) %G%
  */
 
 #include "param.h"
-#include "syscontext.h"
+#include "user.h"
 #include "kernel.h"
 #include "proc.h"
 
@@ -49,12 +49,12 @@ gettimeofday(p, uap, retval)
 		microtime(&atv);
 		if (error = copyout((caddr_t)&atv, (caddr_t)uap->tp,
 		    sizeof (atv)))
-			RETURN (error);
+			return (error);
 	}
 	if (uap->tzp)
 		error = copyout((caddr_t)&tz, (caddr_t)uap->tzp,
 		    sizeof (tz));
-	RETURN (error);
+	return (error);
 }
 
 settimeofday(p, uap, retval)
@@ -70,11 +70,11 @@ settimeofday(p, uap, retval)
 	int error, s;
 
 	if (error = suser(u.u_cred, &u.u_acflag))
-		RETURN (error);
+		return (error);
 	if (uap->tv) {
 		if (error = copyin((caddr_t)uap->tv, (caddr_t)&atv,
 		    sizeof (struct timeval)))
-			RETURN (error);
+			return (error);
 		/* WHAT DO WE DO ABOUT PENDING REAL-TIME TIMEOUTS??? */
 		boottime.tv_sec += atv.tv_sec - time.tv_sec;
 		s = splhigh(); time = atv; splx(s);
@@ -83,7 +83,7 @@ settimeofday(p, uap, retval)
 	if (uap->tzp && (error = copyin((caddr_t)uap->tzp, (caddr_t)&atz,
 	    sizeof (atz))) == 0)
 		tz = atz;
-	RETURN (error);
+	return (error);
 }
 
 extern	int tickadj;			/* "standard" clock skew, us./tick */
@@ -105,10 +105,10 @@ adjtime(p, uap, retval)
 	int s, error;
 
 	if (error = suser(u.u_cred, &u.u_acflag))
-		RETURN (error);
+		return (error);
 	if (error =
 	    copyin((caddr_t)uap->delta, (caddr_t)&atv, sizeof (struct timeval)))
-		RETURN (error);
+		return (error);
 	ndelta = atv.tv_sec * 1000000 + atv.tv_usec;
 	if (timedelta == 0)
 		if (ndelta > bigadj)
@@ -129,7 +129,7 @@ adjtime(p, uap, retval)
 	if (uap->olddelta)
 		(void) copyout((caddr_t)&oatv, (caddr_t)uap->olddelta,
 			sizeof (struct timeval));
-	RETURN (0);
+	return (0);
 }
 
 /*
@@ -166,7 +166,7 @@ getitimer(p, uap, retval)
 	int s;
 
 	if (uap->which > ITIMER_PROF)
-		RETURN (EINVAL);
+		return (EINVAL);
 	s = splclock();
 	if (uap->which == ITIMER_REAL) {
 		/*
@@ -184,7 +184,7 @@ getitimer(p, uap, retval)
 	} else
 		aitv = u.u_timer[uap->which];
 	splx(s);
-	RETURN (copyout((caddr_t)&aitv, (caddr_t)uap->itv,
+	return (copyout((caddr_t)&aitv, (caddr_t)uap->itv,
 	    sizeof (struct itimerval)));
 }
 
@@ -202,17 +202,17 @@ setitimer(p, uap, retval)
 	int s, error;
 
 	if (uap->which > ITIMER_PROF)
-		RETURN (EINVAL);
+		return (EINVAL);
 	itvp = uap->itv;
 	if (itvp && (error = copyin((caddr_t)itvp, (caddr_t)&aitv,
 	    sizeof(struct itimerval))))
-		RETURN (error);
+		return (error);
 	if ((uap->itv = uap->oitv) && (error = getitimer(p, uap, retval)))
-		RETURN (error);
+		return (error);
 	if (itvp == 0)
 		return (0);
 	if (itimerfix(&aitv.it_value) || itimerfix(&aitv.it_interval))
-		RETURN (EINVAL);
+		return (EINVAL);
 	s = splclock();
 	if (uap->which == ITIMER_REAL) {
 		untimeout(realitexpire, (caddr_t)p);
@@ -224,7 +224,7 @@ setitimer(p, uap, retval)
 	} else
 		u.u_timer[uap->which] = aitv;
 	splx(s);
-	RETURN (0);
+	return (0);
 }
 
 /*
diff --git a/usr/src/sys/kern/kern_xxx.c b/usr/src/sys/kern/kern_xxx.c
index 687eddfe79..0297d5722c 100644
--- a/usr/src/sys/kern/kern_xxx.c
+++ b/usr/src/sys/kern/kern_xxx.c
@@ -14,12 +14,12 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- *	@(#)kern_xxx.c	7.12 (Berkeley) %G%
+ *	@(#)kern_xxx.c	7.13 (Berkeley) %G%
  */
 
 #include "param.h"
 #include "systm.h"
-#include "syscontext.h"
+#include "user.h"
 #include "kernel.h"
 #include "proc.h"
 #include "reboot.h"
@@ -32,7 +32,7 @@ gethostid(p, uap, retval)
 {
 
 	*retval = hostid;
-	RETURN (0);
+	return (0);
 }
 
 sethostid(p, uap, retval)
@@ -58,7 +58,7 @@ gethostname(p, uap, retval)
 
 	if (uap->len > hostnamelen + 1)
 		uap->len = hostnamelen + 1;
-	RETURN (copyout((caddr_t)hostname, (caddr_t)uap->hostname, uap->len));
+	return (copyout((caddr_t)hostname, (caddr_t)uap->hostname, uap->len));
 }
 
 /* ARGSUSED */
@@ -73,13 +73,13 @@ sethostname(p, uap, retval)
 	int error;
 
 	if (error = suser(u.u_cred, &u.u_acflag))
-		RETURN (error);
+		return (error);
 	if (uap->len > sizeof (hostname) - 1)
-		RETURN (EINVAL);
+		return (EINVAL);
 	hostnamelen = uap->len;
 	error = copyin((caddr_t)uap->hostname, hostname, uap->len);
 	hostname[hostnamelen] = 0;
-	RETURN (error);
+	return (error);
 }
 
 /* ARGSUSED */
@@ -97,11 +97,11 @@ reboot(p, uap, retval)
 ovhangup()
 {
 
-	RETURN (EINVAL);
+	return (EINVAL);
 }
 
 oldquota()
 {
 
-	RETURN (EINVAL);
+	return (EINVAL);
 }
diff --git a/usr/src/sys/kern/sys_generic.c b/usr/src/sys/kern/sys_generic.c
index 9934b16cc3..88c3d26589 100644
--- a/usr/src/sys/kern/sys_generic.c
+++ b/usr/src/sys/kern/sys_generic.c
@@ -14,12 +14,12 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- *	@(#)sys_generic.c	7.20 (Berkeley) %G%
+ *	@(#)sys_generic.c	7.21 (Berkeley) %G%
  */
 
 #include "param.h"
 #include "systm.h"
-#include "syscontext.h"
+#include "user.h"
 #include "ioctl.h"
 #include "file.h"
 #include "proc.h"
@@ -54,7 +54,7 @@ read(p, uap, retval)
 	if (((unsigned)uap->fdes) >= NOFILE ||
 	    (fp = u.u_ofile[uap->fdes]) == NULL ||
 	    (fp->f_flag & FREAD) == 0)
-		RETURN (EBADF);
+		return (EBADF);
 	aiov.iov_base = (caddr_t)uap->cbuf;
 	aiov.iov_len = uap->count;
 	auio.uio_iov = &aiov;
@@ -80,7 +80,7 @@ read(p, uap, retval)
 		ktrgenio(p->p_tracep, uap->fdes, UIO_READ, &ktriov, cnt, error);
 #endif
 	*retval = cnt;
-	RETURN (error);
+	return (error);
 }
 
 /*
@@ -107,10 +107,10 @@ readv(p, uap, retval)
 	if (((unsigned)uap->fdes) >= NOFILE ||
 	    (fp = u.u_ofile[uap->fdes]) == NULL ||
 	    (fp->f_flag & FREAD) == 0)
-		RETURN (EBADF);
+		return (EBADF);
 	if (uap->iovcnt > UIO_SMALLIOV) {
 		if (uap->iovcnt > UIO_MAXIOV)
-			RETURN (EINVAL);
+			return (EINVAL);
 		MALLOC(iov, struct iovec *, 
 		      sizeof(struct iovec) * uap->iovcnt, M_IOV, M_WAITOK);
 	} else
@@ -164,7 +164,7 @@ readv(p, uap, retval)
 done:
 	if (uap->iovcnt > UIO_SMALLIOV)
 		FREE(iov, M_IOV);
-	RETURN (error);
+	return (error);
 }
 
 /*
@@ -190,7 +190,7 @@ write(p, uap, retval)
 	if (((unsigned)uap->fdes) >= NOFILE ||
 	    (fp = u.u_ofile[uap->fdes]) == NULL ||
 	    (fp->f_flag & FWRITE) == 0)
-		RETURN (EBADF);
+		return (EBADF);
 	aiov.iov_base = (caddr_t)uap->cbuf;
 	aiov.iov_len = uap->count;
 	auio.uio_iov = &aiov;
@@ -220,7 +220,7 @@ write(p, uap, retval)
 		    &ktriov, cnt, error);
 #endif
 	*retval = cnt;
-	RETURN (error);
+	return (error);
 }
 
 /*
@@ -247,10 +247,10 @@ writev(p, uap, retval)
 	if (((unsigned)uap->fdes) >= NOFILE ||
 	    (fp = u.u_ofile[uap->fdes]) == NULL ||
 	    (fp->f_flag & FWRITE) == 0)
-		RETURN (EBADF);
+		return (EBADF);
 	if (uap->iovcnt > UIO_SMALLIOV) {
 		if (uap->iovcnt > UIO_MAXIOV)
-			RETURN (EINVAL);
+			return (EINVAL);
 		MALLOC(iov, struct iovec *, 
 		      sizeof(struct iovec) * uap->iovcnt, M_IOV, M_WAITOK);
 	} else
@@ -307,7 +307,7 @@ writev(p, uap, retval)
 done:
 	if (uap->iovcnt > UIO_SMALLIOV)
 		FREE(iov, M_IOV);
-	RETURN (error);
+	return (error);
 }
 
 /*
@@ -333,18 +333,18 @@ ioctl(p, uap, retval)
 
 	if ((unsigned)uap->fdes >= NOFILE ||
 	    (fp = u.u_ofile[uap->fdes]) == NULL)
-		RETURN (EBADF);
+		return (EBADF);
 	if ((fp->f_flag & (FREAD|FWRITE)) == 0)
-		RETURN (EBADF);
+		return (EBADF);
 	com = uap->cmd;
 
 	if (com == FIOCLEX) {
 		u.u_pofile[uap->fdes] |= UF_EXCLOSE;
-		RETURN (0);
+		return (0);
 	}
 	if (com == FIONCLEX) {
 		u.u_pofile[uap->fdes] &= ~UF_EXCLOSE;
-		RETURN (0);
+		return (0);
 	}
 
 	/*
@@ -354,7 +354,7 @@ ioctl(p, uap, retval)
 	 */
 	size = IOCPARM_LEN(com);
 	if (size > IOCPARM_MAX)
-		RETURN (ENOTTY);
+		return (ENOTTY);
 	if (size > sizeof (stkbuf)) {
 		memp = (caddr_t)malloc((u_long)size, M_IOCTLOPS, M_WAITOK);
 		data = memp;
@@ -365,7 +365,7 @@ ioctl(p, uap, retval)
 			if (error) {
 				if (memp)
 					free(memp, M_IOCTLOPS);
-				RETURN (error);
+				return (error);
 			}
 		} else
 			*(caddr_t *)data = uap->cmarg;
@@ -407,7 +407,7 @@ ioctl(p, uap, retval)
 	}
 	if (memp)
 		free(memp, M_IOCTLOPS);
-	RETURN (error);
+	return (error);
 }
 
 int	nselcoll;
@@ -501,7 +501,7 @@ done:
 		putbits(ex, 2);
 #undef putbits
 	}
-	RETURN (error);
+	return (error);
 }
 
 selscan(ibits, obits, nfd, retval)
diff --git a/usr/src/sys/kern/sys_process.c b/usr/src/sys/kern/sys_process.c
index e291f2f4b5..27e55b755b 100644
--- a/usr/src/sys/kern/sys_process.c
+++ b/usr/src/sys/kern/sys_process.c
@@ -3,12 +3,12 @@
  * All rights reserved.  The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  *
- *	@(#)sys_process.c	7.11 (Berkeley) %G%
+ *	@(#)sys_process.c	7.12 (Berkeley) %G%
  */
 
 #define IPCREG
 #include "param.h"
-#include "syscontext.h"
+#include "user.h"
 #include "proc.h"
 #include "vnode.h"
 #include "text.h"
@@ -57,12 +57,12 @@ ptrace(curp, uap, retval)
 
 	if (uap->req <= 0) {
 		curp->p_flag |= STRC;
-		RETURN (0);
+		return (0);
 	}
 	p = pfind(uap->pid);
 	if (p == 0 || p->p_stat != SSTOP || p->p_ppid != curp->p_pid ||
 	    !(p->p_flag & STRC))
-		RETURN (ESRCH);
+		return (ESRCH);
 	while (ipc.ip_lock)
 		sleep((caddr_t)&ipc, IPCPRI);
 	ipc.ip_lock = p->p_pid;
@@ -79,8 +79,8 @@ ptrace(curp, uap, retval)
 	ipc.ip_lock = 0;
 	wakeup((caddr_t)&ipc);
 	if (ipc.ip_req < 0)
-		RETURN (EIO);
-	RETURN (0);
+		return (EIO);
+	return (0);
 }
 
 #define	PHYSOFF(p, o) \
diff --git a/usr/src/sys/kern/sysv_shm.c b/usr/src/sys/kern/sysv_shm.c
index 5527c46994..7bedea8863 100644
--- a/usr/src/sys/kern/sysv_shm.c
+++ b/usr/src/sys/kern/sysv_shm.c
@@ -11,7 +11,7 @@
  *
  * from: Utah $Hdr: uipc_shm.c 1.9 89/08/14$
  *
- *	@(#)sysv_shm.c	7.8 (Berkeley) %G%
+ *	@(#)sysv_shm.c	7.9 (Berkeley) %G%
  */
 
 /*
@@ -26,7 +26,7 @@
 
 #include "param.h"
 #include "systm.h"
-#include "syscontext.h"
+#include "user.h"
 #include "kernel.h"
 #include "proc.h"
 #include "vm.h"
@@ -69,8 +69,8 @@ shmsys(p, uap, retval)
 {
 
 	if (uap->which >= sizeof(shmcalls)/sizeof(shmcalls[0]))
-		RETURN (EINVAL);
-	RETURN ((*shmcalls[uap->which])(p, &uap[1], retval));
+		return (EINVAL);
+	return ((*shmcalls[uap->which])(p, &uap[1], retval));
 }
 
 /*
diff --git a/usr/src/sys/kern/uipc_syscalls.c b/usr/src/sys/kern/uipc_syscalls.c
index 4395e1c894..c4c17e89f3 100644
--- a/usr/src/sys/kern/uipc_syscalls.c
+++ b/usr/src/sys/kern/uipc_syscalls.c
@@ -12,12 +12,11 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- *	@(#)uipc_syscalls.c	7.17 (Berkeley) %G%
+ *	@(#)uipc_syscalls.c	7.18 (Berkeley) %G%
  */
 
 #include "param.h"
-/* #include "user.h" */
-#include "syscontext.h" /* XXX */
+#include "user.h"
 #include "proc.h"
 #include "file.h"
 #include "buf.h"
@@ -52,7 +51,7 @@ socket(p, uap, retval)
 	int fd, error;
 
 	if (error = falloc(&fp, &fd))
-		RETURN (error);
+		return (error);
 	fp->f_flag = FREAD|FWRITE;
 	fp->f_type = DTYPE_SOCKET;
 	fp->f_ops = &socketops;
@@ -64,7 +63,7 @@ socket(p, uap, retval)
 		fp->f_data = (caddr_t)so;
 		*retval = fd;
 	}
-	RETURN (error);
+	return (error);
 }
 
 /* ARGSUSED */
@@ -83,12 +82,12 @@ bind(p, uap, retval)
 
 	fp = getsock(uap->s, &error);
 	if (fp == 0)
-		RETURN (error);
+		return (error);
 	if (error = sockargs(&nam, uap->name, uap->namelen, MT_SONAME))
-		RETURN (error);
+		return (error);
 	error = sobind((struct socket *)fp->f_data, nam);
 	m_freem(nam);
-	RETURN (error);
+	return (error);
 }
 
 /* ARGSUSED */
@@ -105,8 +104,8 @@ listen(p, uap, retval)
 
 	fp = getsock(uap->s, &error);
 	if (fp == 0)
-		RETURN (error);
-	RETURN (solisten((struct socket *)fp->f_data, uap->backlog));
+		return (error);
+	return (solisten((struct socket *)fp->f_data, uap->backlog));
 }
 
 #ifdef COMPAT_43
@@ -122,7 +121,7 @@ accept(p, uap, retval)
 {
 
 	uap->compat_43 = 0;
-	RETURN (accept1(p, uap, retval));
+	return (accept1(p, uap, retval));
 }
 
 oaccept(p, uap, retval)
@@ -137,7 +136,7 @@ oaccept(p, uap, retval)
 {
 
 	uap->compat_43 = 1;
-	RETURN (accept1(p, uap, retval));
+	return (accept1(p, uap, retval));
 }
 #else /* COMPAT_43 */
 
@@ -164,19 +163,19 @@ accept1(p, uap, retval)
 
 	if (uap->name && (error = copyin((caddr_t)uap->anamelen,
 	    (caddr_t)&namelen, sizeof (namelen))))
-		RETURN (error);
+		return (error);
 	fp = getsock(uap->s, &error);
 	if (fp == 0)
-		RETURN (error);
+		return (error);
 	s = splnet();
 	so = (struct socket *)fp->f_data;
 	if ((so->so_options & SO_ACCEPTCONN) == 0) {
 		splx(s);
-		RETURN (EINVAL);
+		return (EINVAL);
 	}
 	if ((so->so_state & SS_NBIO) && so->so_qlen == 0) {
 		splx(s);
-		RETURN (EWOULDBLOCK);
+		return (EWOULDBLOCK);
 	}
 	while (so->so_qlen == 0 && so->so_error == 0) {
 		if (so->so_state & SS_CANTRCVMORE) {
@@ -186,18 +185,18 @@ accept1(p, uap, retval)
 		if (error = tsleep((caddr_t)&so->so_timeo, PSOCK | PCATCH,
 		    netcon, 0)) {
 			splx(s);
-			RETURN (error);
+			return (error);
 		}
 	}
 	if (so->so_error) {
 		error = so->so_error;
 		so->so_error = 0;
 		splx(s);
-		RETURN (error);
+		return (error);
 	}
 	if (error = falloc(&fp, retval)) {
 		splx(s);
-		RETURN (error);
+		return (error);
 	}
 	{ struct socket *aso = so->so_q;
 	  if (soqremque(aso, 1) == 0)
@@ -226,7 +225,7 @@ accept1(p, uap, retval)
 	}
 	m_freem(nam);
 	splx(s);
-	RETURN (error);
+	return (error);
 }
 
 /* ARGSUSED */
@@ -246,18 +245,18 @@ connect(p, uap, retval)
 
 	fp = getsock(uap->s, &error);
 	if (fp == 0)
-		RETURN (error);
+		return (error);
 	so = (struct socket *)fp->f_data;
 	if ((so->so_state & SS_NBIO) && (so->so_state & SS_ISCONNECTING))
-		RETURN (EALREADY);
+		return (EALREADY);
 	if (error = sockargs(&nam, uap->name, uap->namelen, MT_SONAME))
-		RETURN (error);
+		return (error);
 	error = soconnect(so, nam);
 	if (error)
 		goto bad;
 	if ((so->so_state & SS_NBIO) && (so->so_state & SS_ISCONNECTING)) {
 		m_freem(nam);
-		RETURN (EINPROGRESS);
+		return (EINPROGRESS);
 	}
 	s = splnet();
 	while ((so->so_state & SS_ISCONNECTING) && so->so_error == 0)
@@ -274,7 +273,7 @@ bad:
 	m_freem(nam);
 	if (error == ERESTART)
 		error = EINTR;
-	RETURN (error);
+	return (error);
 }
 
 /* ARGSUSED */
@@ -293,7 +292,7 @@ socketpair(p, uap, retval)
 	int fd, error, sv[2];
 
 	if (error = socreate(uap->domain, &so1, uap->type, uap->protocol))
-		RETURN (error);
+		return (error);
 	if (error = socreate(uap->domain, &so2, uap->type, uap->protocol))
 		goto free1;
 	if (error = falloc(&fp1, &fd))
@@ -322,7 +321,7 @@ socketpair(p, uap, retval)
 	error = copyout((caddr_t)sv, (caddr_t)uap->rsv, 2 * sizeof (int));
 	retval[0] = sv[0];		/* XXX ??? */
 	retval[1] = sv[1];		/* XXX ??? */
-	RETURN (error);
+	return (error);
 free4:
 	crfree(fp2->f_cred);
 	fp2->f_count = 0;
@@ -335,7 +334,7 @@ free2:
 	(void)soclose(so2);
 free1:
 	(void)soclose(so1);
-	RETURN (error);
+	return (error);
 }
 
 /* ARGSUSED */
@@ -364,7 +363,7 @@ sendto(p, uap, retval)
 #endif
 	aiov.iov_base = uap->buf;
 	aiov.iov_len = uap->len;
-	RETURN (sendit(uap->s, &msg, uap->flags, retval));
+	return (sendit(uap->s, &msg, uap->flags, retval));
 }
 
 #ifdef COMPAT_43
@@ -390,7 +389,7 @@ osend(p, uap, retval)
 	aiov.iov_len = uap->len;
 	msg.msg_control = 0;
 	msg.msg_flags = 0;
-	RETURN (sendit(uap->s, &msg, uap->flags, retval));
+	return (sendit(uap->s, &msg, uap->flags, retval));
 }
 
 #define MSG_COMPAT	0x8000
@@ -409,10 +408,10 @@ osendmsg(p, uap, retval)
 	int error;
 
 	if (error = copyin(uap->msg, (caddr_t)&msg, sizeof (struct omsghdr)))
-		RETURN (error);
+		return (error);
 	if ((u_int)msg.msg_iovlen >= UIO_SMALLIOV) {
 		if ((u_int)msg.msg_iovlen >= UIO_MAXIOV)
-			RETURN (EMSGSIZE);
+			return (EMSGSIZE);
 		MALLOC(iov, struct iovec *,
 		      sizeof(struct iovec) * (u_int)msg.msg_iovlen, M_IOV, 
 		      M_WAITOK);
@@ -427,7 +426,7 @@ osendmsg(p, uap, retval)
 done:
 	if (iov != aiov)
 		FREE(iov, M_IOV);
-	RETURN (error);
+	return (error);
 }
 #endif
 
@@ -446,10 +445,10 @@ sendmsg(p, uap, retval)
 	int error;
 
 	if (error = copyin(uap->msg, (caddr_t)&msg, sizeof (msg)))
-		RETURN (error);
+		return (error);
 	if ((u_int)msg.msg_iovlen >= UIO_SMALLIOV) {
 		if ((u_int)msg.msg_iovlen >= UIO_MAXIOV)
-			RETURN (EMSGSIZE);
+			return (EMSGSIZE);
 		MALLOC(iov, struct iovec *,
 		       sizeof(struct iovec) * (u_int)msg.msg_iovlen, M_IOV,
 		       M_WAITOK);
@@ -467,7 +466,7 @@ sendmsg(p, uap, retval)
 done:
 	if (iov != aiov)
 		FREE(iov, M_IOV);
-	RETURN (error);
+	return (error);
 }
 
 sendit(s, mp, flags, retsize)
@@ -585,7 +584,7 @@ orecvfrom(p, uap, retval)
 {
 
 	uap->flags |= MSG_COMPAT;
-	RETURN (recvfrom(p, uap, retval));
+	return (recvfrom(p, uap, retval));
 }
 #endif
 
@@ -609,7 +608,7 @@ recvfrom(p, uap, retval)
 	if (uap->fromlenaddr) {
 		if (error = copyin((caddr_t)uap->fromlenaddr,
 		    (caddr_t)&msg.msg_namelen, sizeof (msg.msg_namelen)))
-			RETURN (error);
+			return (error);
 	} else
 		msg.msg_namelen = 0;
 	msg.msg_name = uap->from;
@@ -619,7 +618,7 @@ recvfrom(p, uap, retval)
 	aiov.iov_len = uap->len;
 	msg.msg_control = 0;
 	msg.msg_flags = uap->flags;
-	RETURN (recvit(uap->s, &msg, (caddr_t)uap->fromlenaddr, retval));
+	return (recvit(uap->s, &msg, (caddr_t)uap->fromlenaddr, retval));
 }
 
 #ifdef COMPAT_43
@@ -645,7 +644,7 @@ orecv(p, uap, retval)
 	aiov.iov_len = uap->len;
 	msg.msg_control = 0;
 	msg.msg_flags = uap->flags;
-	RETURN (recvit(uap->s, &msg, (caddr_t)0, retval));
+	return (recvit(uap->s, &msg, (caddr_t)0, retval));
 }
 
 /*
@@ -669,10 +668,10 @@ orecvmsg(p, uap, retval)
 
 	if (error = copyin((caddr_t)uap->msg, (caddr_t)&msg,
 	    sizeof (struct omsghdr)))
-		RETURN (error);
+		return (error);
 	if ((u_int)msg.msg_iovlen >= UIO_SMALLIOV) {
 		if ((u_int)msg.msg_iovlen >= UIO_MAXIOV)
-			RETURN (EMSGSIZE);
+			return (EMSGSIZE);
 		MALLOC(iov, struct iovec *,
 		      sizeof(struct iovec) * (u_int)msg.msg_iovlen, M_IOV,
 		      M_WAITOK);
@@ -691,7 +690,7 @@ orecvmsg(p, uap, retval)
 done:
 	if (iov != aiov)
 		FREE(iov, M_IOV);
-	RETURN (error);
+	return (error);
 }
 #endif
 
@@ -710,10 +709,10 @@ recvmsg(p, uap, retval)
 	register int error;
 
 	if (error = copyin((caddr_t)uap->msg, (caddr_t)&msg, sizeof (msg)))
-		RETURN (error);
+		return (error);
 	if ((u_int)msg.msg_iovlen >= UIO_SMALLIOV) {
 		if ((u_int)msg.msg_iovlen >= UIO_MAXIOV)
-			RETURN (EMSGSIZE);
+			return (EMSGSIZE);
 		MALLOC(iov, struct iovec *,
 		       sizeof(struct iovec) * (u_int)msg.msg_iovlen, M_IOV,
 		       M_WAITOK);
@@ -736,7 +735,7 @@ recvmsg(p, uap, retval)
 done:
 	if (iov != aiov)
 		FREE(iov, M_IOV);
-	RETURN (error);
+	return (error);
 }
 
 recvit(s, mp, namelenp, retsize)
@@ -881,8 +880,8 @@ shutdown(p, uap, retval)
 
 	fp = getsock(uap->s, &error);
 	if (fp == 0)
-		RETURN (error);
-	RETURN (soshutdown((struct socket *)fp->f_data, uap->how));
+		return (error);
+	return (soshutdown((struct socket *)fp->f_data, uap->how));
 }
 
 /* ARGSUSED */
@@ -903,21 +902,21 @@ setsockopt(p, uap, retval)
 
 	fp = getsock(uap->s, &error);
 	if (fp == 0)
-		RETURN (error);
+		return (error);
 	if (uap->valsize > MLEN)
-		RETURN (EINVAL);
+		return (EINVAL);
 	if (uap->val) {
 		m = m_get(M_WAIT, MT_SOOPTS);
 		if (m == NULL)
-			RETURN (ENOBUFS);
+			return (ENOBUFS);
 		if (error = copyin(uap->val, mtod(m, caddr_t),
 		    (u_int)uap->valsize)) {
 			(void) m_free(m);
-			RETURN (error);
+			return (error);
 		}
 		m->m_len = uap->valsize;
 	}
-	RETURN (sosetopt((struct socket *)fp->f_data, uap->level,
+	return (sosetopt((struct socket *)fp->f_data, uap->level,
 	    uap->name, m));
 }
 
@@ -939,11 +938,11 @@ getsockopt(p, uap, retval)
 
 	fp = getsock(uap->s, &error);
 	if (fp == 0)
-		RETURN (error);
+		return (error);
 	if (uap->val) {
 		if (error = copyin((caddr_t)uap->avalsize, (caddr_t)&valsize,
 		    sizeof (valsize)))
-			RETURN (error);
+			return (error);
 	} else
 		valsize = 0;
 	if ((error = sogetopt((struct socket *)fp->f_data, uap->level,
@@ -957,7 +956,7 @@ getsockopt(p, uap, retval)
 	}
 	if (m != NULL)
 		(void) m_free(m);
-	RETURN (error);
+	return (error);
 }
 
 /* ARGSUSED */
@@ -971,7 +970,7 @@ pipe(p, uap, retval)
 	int fd, error;
 
 	if (error = socreate(AF_UNIX, &rso, SOCK_STREAM, 0))
-		RETURN (error);
+		return (error);
 	if (error = socreate(AF_UNIX, &wso, SOCK_STREAM, 0))
 		goto free1;
 	if (error = falloc(&rf, &fd))
@@ -990,7 +989,7 @@ pipe(p, uap, retval)
 	retval[1] = fd;
 	if (error = unp_connect2(wso, rso))
 		goto free4;
-	RETURN (0);
+	return (0);
 free4:
 	wf->f_count = 0;
 	u.u_ofile[retval[1]] = 0;
@@ -1001,7 +1000,7 @@ free2:
 	(void)soclose(wso);
 free1:
 	(void)soclose(rso);
-	RETURN (error);
+	return (error);
 }
 
 /*
@@ -1020,7 +1019,7 @@ getsockname(p, uap, retval)
 {
 
 	uap->compat_43 = 0;
-	RETURN (getsockname1(p, uap, retval));
+	return (getsockname1(p, uap, retval));
 }
 
 ogetsockname(p, uap, retval)
@@ -1035,7 +1034,7 @@ ogetsockname(p, uap, retval)
 {
 
 	uap->compat_43 = 1;
-	RETURN (getsockname1(p, uap, retval));
+	return (getsockname1(p, uap, retval));
 }
 #else /* COMPAT_43 */
 
@@ -1062,13 +1061,13 @@ getsockname1(p, uap, retval)
 
 	fp = getsock(uap->fdes, &error);
 	if (fp == 0)
-		RETURN (error);
+		return (error);
 	if (error = copyin((caddr_t)uap->alen, (caddr_t)&len, sizeof (len)))
-		RETURN (error);
+		return (error);
 	so = (struct socket *)fp->f_data;
 	m = m_getclr(M_WAIT, MT_SONAME);
 	if (m == NULL)
-		RETURN (ENOBUFS);
+		return (ENOBUFS);
 	if (error = (*so->so_proto->pr_usrreq)(so, PRU_SOCKADDR, 0, m, 0))
 		goto bad;
 	if (len > m->m_len)
@@ -1084,7 +1083,7 @@ getsockname1(p, uap, retval)
 		    sizeof (len));
 bad:
 	m_freem(m);
-	RETURN (error);
+	return (error);
 }
 
 /*
@@ -1103,7 +1102,7 @@ getpeername(p, uap, retval)
 {
 
 	uap->compat_43 = 0;
-	RETURN (getpeername1(p, uap, retval));
+	return (getpeername1(p, uap, retval));
 }
 
 ogetpeername(p, uap, retval)
@@ -1118,7 +1117,7 @@ ogetpeername(p, uap, retval)
 {
 
 	uap->compat_43 = 1;
-	RETURN (getpeername1(p, uap, retval));
+	return (getpeername1(p, uap, retval));
 }
 #else /* COMPAT_43 */
 
@@ -1145,15 +1144,15 @@ getpeername1(p, uap, retval)
 
 	fp = getsock(uap->fdes, &error);
 	if (fp == 0)
-		RETURN (error);
+		return (error);
 	so = (struct socket *)fp->f_data;
 	if ((so->so_state & (SS_ISCONNECTED|SS_ISCONFIRMING)) == 0)
-		RETURN (ENOTCONN);
+		return (ENOTCONN);
 	m = m_getclr(M_WAIT, MT_SONAME);
 	if (m == NULL)
-		RETURN (ENOBUFS);
+		return (ENOBUFS);
 	if (error = copyin((caddr_t)uap->alen, (caddr_t)&len, sizeof (len)))
-		RETURN (error);
+		return (error);
 	if (error = (*so->so_proto->pr_usrreq)(so, PRU_PEERADDR, 0, m, 0))
 		goto bad;
 	if (len > m->m_len)
@@ -1168,7 +1167,7 @@ getpeername1(p, uap, retval)
 	error = copyout((caddr_t)&len, (caddr_t)uap->alen, sizeof (len));
 bad:
 	m_freem(m);
-	RETURN (error);
+	return (error);
 }
 
 sockargs(mp, buf, buflen, type)
diff --git a/usr/src/sys/kern/vfs_syscalls.c b/usr/src/sys/kern/vfs_syscalls.c
index 9a0579bca6..49d862a620 100644
--- a/usr/src/sys/kern/vfs_syscalls.c
+++ b/usr/src/sys/kern/vfs_syscalls.c
@@ -14,12 +14,12 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- *	@(#)vfs_syscalls.c	7.54 (Berkeley) %G%
+ *	@(#)vfs_syscalls.c	7.55 (Berkeley) %G%
  */
 
 #include "param.h"
 #include "systm.h"
-#include "syscontext.h"
+#include "user.h"
 #include "kernel.h"
 #include "file.h"
 #include "stat.h"
@@ -29,7 +29,6 @@
 #include "uio.h"
 #include "malloc.h"
 
-#undef RETURN
 #define RETURN(val) {if (u.u_spare[0] != 0) panic("lock count"); return (val);}
 
 /*
diff --git a/usr/src/sys/tahoe/tahoe/machdep.c b/usr/src/sys/tahoe/tahoe/machdep.c
index d1a49c75aa..0dd8168612 100644
--- a/usr/src/sys/tahoe/tahoe/machdep.c
+++ b/usr/src/sys/tahoe/tahoe/machdep.c
@@ -3,13 +3,12 @@
  * All rights reserved.  The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  *
- *	@(#)machdep.c	7.12 (Berkeley) %G%
+ *	@(#)machdep.c	7.13 (Berkeley) %G%
  */
 
 #include "param.h"
 #include "systm.h"
-/* #include "user.h" */
-#include "syscontext.h"
+#include "user.h"
 #include "kernel.h"
 #include "map.h"
 #include "vm.h"
@@ -392,17 +391,17 @@ sigreturn(p, uap, retval)
 
 	scp = uap->sigcntxp;
 	if (useracc((caddr_t)scp, sizeof (*scp), 0) == 0)
-		RETURN (EINVAL);
+		return (EINVAL);
 	if ((scp->sc_ps & (PSL_MBZ|PSL_IPL|PSL_IS)) != 0 ||
 	    (scp->sc_ps & (PSL_PRVMOD|PSL_CURMOD)) != (PSL_PRVMOD|PSL_CURMOD))
-		RETURN (EINVAL);
+		return (EINVAL);
 	u.u_onstack = scp->sc_onstack & 01;
 	p->p_sigmask = scp->sc_mask &~ sigcantmask;
 	regs[FP] = scp->sc_fp;
 	regs[SP] = scp->sc_sp;
 	regs[PC] = scp->sc_pc;
 	regs[PS] = scp->sc_ps;
-	RETURN (EJUSTRETURN);
+	return (EJUSTRETURN);
 }
 
 int	waittime = -1;
diff --git a/usr/src/sys/tahoe/tahoe/sys_machdep.c b/usr/src/sys/tahoe/tahoe/sys_machdep.c
index 121b1decd3..db30c1b1bb 100644
--- a/usr/src/sys/tahoe/tahoe/sys_machdep.c
+++ b/usr/src/sys/tahoe/tahoe/sys_machdep.c
@@ -3,7 +3,7 @@
  * All rights reserved.  The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  *
- *	@(#)sys_machdep.c	7.4 (Berkeley) %G%
+ *	@(#)sys_machdep.c	7.5 (Berkeley) %G%
  */
 
 #include "param.h"
@@ -37,20 +37,20 @@ vtrace(p, uap, retval)
 	case VTR_DISABLE:		/* disable a trace point */
 	case VTR_ENABLE:		/* enable a trace point */
 		if (uap->value < 0 || uap->value >= TR_NFLAGS)
-			RETURN (EINVAL);
+			return (EINVAL);
 		*retval = traceflags[uap->value];
 		traceflags[uap->value] = uap->request;
 		break;
 
 	case VTR_VALUE:		/* return a trace point setting */
 		if (uap->value < 0 || uap->value >= TR_NFLAGS)
-			RETURN (EINVAL);
+			return (EINVAL);
 		*retval = traceflags[uap->value];
 		break;
 
 	case VTR_UALARM:	/* set a real-time ualarm, less than 1 min */
 		if (uap->value <= 0 || uap->value > 60 * hz || nvualarm > 5)
-			RETURN (EINVAL);
+			return (EINVAL);
 		nvualarm++;
 		timeout(vdoualarm, (caddr_t)p->p_pid, uap->value);
 		break;
@@ -59,7 +59,7 @@ vtrace(p, uap, retval)
 		trace(TR_STAMP, uap->value, p->p_pid);
 		break;
 	}
-	RETURN (0);
+	return (0);
 }
 
 vdoualarm(arg)
diff --git a/usr/src/sys/vax/vax/machdep.c b/usr/src/sys/vax/vax/machdep.c
index b9d050c9ee..1897b58766 100644
--- a/usr/src/sys/vax/vax/machdep.c
+++ b/usr/src/sys/vax/vax/machdep.c
@@ -3,12 +3,12 @@
  * All rights reserved.  The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  *
- *	@(#)machdep.c	7.29 (Berkeley) %G%
+ *	@(#)machdep.c	7.30 (Berkeley) %G%
  */
 
 #include "param.h"
 #include "systm.h"
-#include "syscontext.h"
+#include "user.h"
 #include "kernel.h"
 #include "malloc.h"
 #include "map.h"
@@ -428,12 +428,12 @@ sigreturn(p, uap, retval)
 
 	scp = uap->sigcntxp;
 	if (useracc((caddr_t)scp, sizeof (*scp), B_WRITE) == 0)
-		RETURN (EINVAL);
+		return (EINVAL);
 	if ((scp->sc_ps & (PSL_MBZ|PSL_IPL|PSL_IS)) != 0 ||
 	    (scp->sc_ps & (PSL_PRVMOD|PSL_CURMOD)) != (PSL_PRVMOD|PSL_CURMOD) ||
 	    ((scp->sc_ps & PSL_CM) &&
 	     (scp->sc_ps & (PSL_FPD|PSL_DV|PSL_FU|PSL_IV)) != 0))
-		RETURN (EINVAL);
+		return (EINVAL);
 	u.u_onstack = scp->sc_onstack & 01;
 	p->p_sigmask = scp->sc_mask &~ sigcantmask;
 	regs[FP] = scp->sc_fp;
@@ -441,7 +441,7 @@ sigreturn(p, uap, retval)
 	regs[SP] = scp->sc_sp;
 	regs[PC] = scp->sc_pc;
 	regs[PS] = scp->sc_ps;
-	RETURN (EJUSTRETURN);
+	return (EJUSTRETURN);
 }
 
 /*
diff --git a/usr/src/sys/vax/vax/sys_machdep.c b/usr/src/sys/vax/vax/sys_machdep.c
index 5fbeb91ed5..0ae91a6b21 100644
--- a/usr/src/sys/vax/vax/sys_machdep.c
+++ b/usr/src/sys/vax/vax/sys_machdep.c
@@ -3,12 +3,12 @@
  * All rights reserved.  The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  *
- *	@(#)sys_machdep.c	7.4 (Berkeley) %G%
+ *	@(#)sys_machdep.c	7.5 (Berkeley) %G%
  */
 
 #include "param.h"
 #include "systm.h"
-#include "syscontext.h"
+#include "user.h"
 #include "ioctl.h"
 #include "file.h"
 #include "proc.h"
@@ -33,10 +33,10 @@ resuba(p, uap, retval)
 	int error;
 
 	if (error = suser(u.u_cred, &u.u_acflag))
-		RETURN (error);
+		return (error);
 	if (uap->value < numuba)
 		ubareset(uap->value);
-	RETURN (0);
+	return (0);
 }
 
 #ifdef TRACE
@@ -57,20 +57,20 @@ vtrace(p, uap, retval)
 	case VTR_DISABLE:		/* disable a trace point */
 	case VTR_ENABLE:		/* enable a trace point */
 		if (uap->value < 0 || uap->value >= TR_NFLAGS)
-			RETURN (EINVAL);
+			return (EINVAL);
 		*retval = traceflags[uap->value];
 		traceflags[uap->value] = uap->request;
 		break;
 
 	case VTR_VALUE:		/* return a trace point setting */
 		if (uap->value < 0 || uap->value >= TR_NFLAGS)
-			RETURN (EINVAL);
+			return (EINVAL);
 		*retval = traceflags[uap->value];
 		break;
 
 	case VTR_UALARM:	/* set a real-time ualarm, less than 1 min */
 		if (uap->value <= 0 || uap->value > 60 * hz || nvualarm > 5)
-			RETURN (EINVAL);
+			return (EINVAL);
 		nvualarm++;
 		timeout(vdoualarm, (caddr_t)p->p_pid, uap->value);
 		break;
@@ -79,7 +79,7 @@ vtrace(p, uap, retval)
 		trace(TR_STAMP, uap->value, p->p_pid);
 		break;
 	}
-	RETURN (0);
+	return (0);
 }
 
 vdoualarm(arg)
diff --git a/usr/src/sys/vm/vm_swap.c b/usr/src/sys/vm/vm_swap.c
index c5d286937d..230bc29461 100644
--- a/usr/src/sys/vm/vm_swap.c
+++ b/usr/src/sys/vm/vm_swap.c
@@ -14,14 +14,14 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- *	@(#)vm_swap.c	7.12 (Berkeley) %G%
+ *	@(#)vm_swap.c	7.13 (Berkeley) %G%
  */
 
 #include "param.h"
 #include "systm.h"
 #include "buf.h"
 #include "conf.h"
-#include "syscontext.h"
+#include "user.h"
 #include "vnode.h"
 #include "specdev.h"
 #include "map.h"
@@ -98,33 +98,33 @@ swapon(p, uap, retval)
 	int error;
 
 	if (error = suser(u.u_cred, &u.u_acflag))
-		RETURN (error);
+		return (error);
 	ndp->ni_nameiop = LOOKUP | FOLLOW;
 	ndp->ni_segflg = UIO_USERSPACE;
 	ndp->ni_dirp = uap->name;
 	if (error = namei(ndp))
-		RETURN (error);
+		return (error);
 	vp = ndp->ni_vp;
 	if (vp->v_type != VBLK) {
 		vrele(vp);
-		RETURN (ENOTBLK);
+		return (ENOTBLK);
 	}
 	dev = (dev_t)vp->v_rdev;
 	if (major(dev) >= nblkdev) {
 		vrele(vp);
-		RETURN (ENXIO);
+		return (ENXIO);
 	}
 	for (sp = &swdevt[0]; sp->sw_dev; sp++)
 		if (sp->sw_dev == dev) {
 			if (sp->sw_freed) {
 				vrele(vp);
-				RETURN (EBUSY);
+				return (EBUSY);
 			}
 			u.u_error = swfree(sp - swdevt);
-			RETURN (0);
+			return (0);
 		}
 	vrele(vp);
-	RETURN (EINVAL);
+	return (EINVAL);
 }
 
 #ifdef SECSIZE
-- 
2.20.1