Move the "retval" (3rd) parameter from all syscall functions and put

it in struct proc instead.

This fixes a boatload of compiler warning, and removes a lot of cruft
from the sources.

I have not removed the /*ARGSUSED*/, they will require some looking at.

libkvm, ps and other userland struct proc frobbing programs will need
recompiled.

16 files changed, 341 insertions, 415 deletions

diff --git a/sys/i386/ibcs2/ibcs2_fcntl.c b/sys/i386/ibcs2/ibcs2_fcntl.c
index 0930ea9..82d7286 100644
--- a/sys/i386/ibcs2/ibcs2_fcntl.c
+++ b/sys/i386/ibcs2/ibcs2_fcntl.c
@@ -24,7 +24,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: ibcs2_fcntl.c,v 1.8 1997/03/24 11:52:23 bde Exp $
+ * $Id: ibcs2_fcntl.c,v 1.9 1997/07/20 09:39:41 bde Exp $
  */
 
 #include <sys/param.h>
@@ -165,10 +165,9 @@ oflags2ioflags(flags)
 }
 
 int
-ibcs2_open(p, uap, retval)
+ibcs2_open(p, uap)
 	struct proc *p;
 	struct ibcs2_open_args *uap;
-	int *retval;
 {
 	int noctty = SCARG(uap, flags) & IBCS2_O_NOCTTY;
 	int ret;
@@ -179,17 +178,17 @@ ibcs2_open(p, uap, retval)
 		CHECKALTCREAT(p, &sg, SCARG(uap, path));
 	else
 		CHECKALTEXIST(p, &sg, SCARG(uap, path));
-	ret = open(p, (struct open_args *)uap, retval);
+	ret = open(p, (struct open_args *)uap);
 
 #ifdef SPX_HACK
 	if(ret == ENXIO)
 		if(!strcmp(SCARG(uap, path), "/compat/ibcs2/dev/spx"))
-			ret = spx_open(p, uap, retval);
+			ret = spx_open(p, uap);
 	else
 #endif /* SPX_HACK */
 	if (!ret && !noctty && SESS_LEADER(p) && !(p->p_flag & P_CONTROLT)) {
 		struct filedesc *fdp = p->p_fd;
-		struct file *fp = fdp->fd_ofiles[*retval];
+		struct file *fp = fdp->fd_ofiles[p->p_retval[0]];
 
 		/* ignore any error, just give it a try */
 		if (fp->f_type == DTYPE_VNODE)
@@ -199,10 +198,9 @@ ibcs2_open(p, uap, retval)
 }
 
 int
-ibcs2_creat(p, uap, retval)
+ibcs2_creat(p, uap)
         struct proc *p;  
 	struct ibcs2_creat_args *uap;
-	int *retval;
 {       
 	struct open_args cup;   
 	caddr_t sg = stackgap_init();
@@ -211,14 +209,13 @@ ibcs2_creat(p, uap, retval)
 	SCARG(&cup, path) = SCARG(uap, path);
 	SCARG(&cup, mode) = SCARG(uap, mode);
 	SCARG(&cup, flags) = O_WRONLY | O_CREAT | O_TRUNC;
-	return open(p, &cup, retval);
+	return open(p, &cup);
 }       
 
 int
-ibcs2_access(p, uap, retval)
+ibcs2_access(p, uap)
         struct proc *p;
         struct ibcs2_access_args *uap;
-        int *retval;
 {
         struct access_args cup;
         caddr_t sg = stackgap_init();
@@ -226,14 +223,13 @@ ibcs2_access(p, uap, retval)
         CHECKALTEXIST(p, &sg, SCARG(uap, path));
         SCARG(&cup, path) = SCARG(uap, path);
         SCARG(&cup, flags) = SCARG(uap, flags);
-        return access(p, &cup, retval);
+        return access(p, &cup);
 }
 
 int
-ibcs2_fcntl(p, uap, retval)
+ibcs2_fcntl(p, uap)
 	struct proc *p;
 	struct ibcs2_fcntl_args *uap;
-	int *retval;
 {
 	int error;
 	struct fcntl_args fa;
@@ -245,32 +241,32 @@ ibcs2_fcntl(p, uap, retval)
 		SCARG(&fa, fd) = SCARG(uap, fd);
 		SCARG(&fa, cmd) = F_DUPFD;
 		SCARG(&fa, arg) = (/* XXX */ int)SCARG(uap, arg);
-		return fcntl(p, &fa, retval);
+		return fcntl(p, &fa);
 	case IBCS2_F_GETFD:
 		SCARG(&fa, fd) = SCARG(uap, fd);
 		SCARG(&fa, cmd) = F_GETFD;
 		SCARG(&fa, arg) = (/* XXX */ int)SCARG(uap, arg);
-		return fcntl(p, &fa, retval);
+		return fcntl(p, &fa);
 	case IBCS2_F_SETFD:
 		SCARG(&fa, fd) = SCARG(uap, fd);
 		SCARG(&fa, cmd) = F_SETFD;
 		SCARG(&fa, arg) = (/* XXX */ int)SCARG(uap, arg);
-		return fcntl(p, &fa, retval);
+		return fcntl(p, &fa);
 	case IBCS2_F_GETFL:
 		SCARG(&fa, fd) = SCARG(uap, fd);
 		SCARG(&fa, cmd) = F_GETFL;
 		SCARG(&fa, arg) = (/* XXX */ int)SCARG(uap, arg);
-		error = fcntl(p, &fa, retval);
+		error = fcntl(p, &fa);
 		if (error)
 			return error;
-		*retval = oflags2ioflags(*retval);
+		p->p_retval[0] = oflags2ioflags(p->p_retval[0]);
 		return error;
 	case IBCS2_F_SETFL:
 		SCARG(&fa, fd) = SCARG(uap, fd);
 		SCARG(&fa, cmd) = F_SETFL;
 		SCARG(&fa, arg) = (/* XXX */ int)
 				  ioflags2oflags((int)SCARG(uap, arg));
-		return fcntl(p, &fa, retval);
+		return fcntl(p, &fa);
 
 	case IBCS2_F_GETLK:
 	    {
@@ -284,7 +280,7 @@ ibcs2_fcntl(p, uap, retval)
 		SCARG(&fa, fd) = SCARG(uap, fd);
 		SCARG(&fa, cmd) = F_GETLK;
 		SCARG(&fa, arg) = (/* XXX */ int)flp;
-		error = fcntl(p, &fa, retval);
+		error = fcntl(p, &fa);
 		if (error)
 			return error;
 		cvt_flock2iflock(flp, &ifl);
@@ -305,7 +301,7 @@ ibcs2_fcntl(p, uap, retval)
 		SCARG(&fa, cmd) = F_SETLK;
 		SCARG(&fa, arg) = (/* XXX */ int)flp;
 
-		return fcntl(p, &fa, retval);
+		return fcntl(p, &fa);
 	    }
 
 	case IBCS2_F_SETLKW:
@@ -320,7 +316,7 @@ ibcs2_fcntl(p, uap, retval)
 		SCARG(&fa, fd) = SCARG(uap, fd);
 		SCARG(&fa, cmd) = F_SETLKW;
 		SCARG(&fa, arg) = (/* XXX */ int)flp;
-		return fcntl(p, &fa, retval);
+		return fcntl(p, &fa);
 	    }
 	}
 	return ENOSYS;
diff --git a/sys/i386/ibcs2/ibcs2_ioctl.c b/sys/i386/ibcs2/ibcs2_ioctl.c
index 18ef367..873ecc8 100644
--- a/sys/i386/ibcs2/ibcs2_ioctl.c
+++ b/sys/i386/ibcs2/ibcs2_ioctl.c
@@ -53,7 +53,7 @@ static void stio2stios  __P((struct ibcs2_termio *, struct ibcs2_termios *));
 
 
 int
-ibcs2_gtty(struct proc *p, struct ibcs2_gtty_args *args, int *retval)
+ibcs2_gtty(struct proc *p, struct ibcs2_gtty_args *args)
 {
 	struct ioctl_args ioctl_arg;
 
@@ -61,11 +61,11 @@ ibcs2_gtty(struct proc *p, struct ibcs2_gtty_args *args, int *retval)
 	ioctl_arg.com = TIOCGETC;
 	ioctl_arg.data = (caddr_t)args->buf;
 
-	return ioctl(p, &ioctl_arg, retval);
+	return ioctl(p, &ioctl_arg);
 }
 
 int
-ibcs2_stty(struct proc *p, struct ibcs2_stty_args *args, int *retval)
+ibcs2_stty(struct proc *p, struct ibcs2_stty_args *args)
 {
 	struct ioctl_args ioctl_arg;
 
@@ -73,7 +73,7 @@ ibcs2_stty(struct proc *p, struct ibcs2_stty_args *args, int *retval)
 	ioctl_arg.com = TIOCSETC;
 	ioctl_arg.data = (caddr_t)args->buf;
 
-	return ioctl(p, &ioctl_arg, retval);
+	return ioctl(p, &ioctl_arg);
 }
 
 
@@ -332,10 +332,9 @@ stio2stios(t, ts)
 }
 
 int
-ibcs2_ioctl(p, uap, retval)
+ibcs2_ioctl(p, uap)
 	struct proc *p;
 	struct ibcs2_ioctl_args *uap;
-	int *retval;
 {
 	struct filedesc *fdp = p->p_fd;
 	struct file *fp;
@@ -493,11 +492,11 @@ ibcs2_ioctl(p, uap, retval)
 
 	case IBCS2_TIOCGWINSZ:
 		SCARG(uap, cmd) = TIOCGWINSZ;
-		return ioctl(p, (struct ioctl_args *)uap, retval);
+		return ioctl(p, (struct ioctl_args *)uap);
 
 	case IBCS2_TIOCSWINSZ:
 		SCARG(uap, cmd) = TIOCSWINSZ;
-		return ioctl(p, (struct ioctl_args *)uap, retval);
+		return ioctl(p, (struct ioctl_args *)uap);
 
 	case IBCS2_TIOCGPGRP:
 		return copyout((caddr_t)&p->p_pgrp->pg_id, SCARG(uap, data),
@@ -509,7 +508,7 @@ ibcs2_ioctl(p, uap, retval)
 
 		SCARG(&sa, pid) = 0;
 		SCARG(&sa, pgid) = (int)SCARG(uap, data);
-		if (error = setpgid(p, &sa, retval))
+		if (error = setpgid(p, &sa))
 			return error;
 		return 0;
 	    }
@@ -543,93 +542,92 @@ ibcs2_ioctl(p, uap, retval)
 	case IBCS2_KDGKBMODE:        /* get keyboard translation mode */
 	        SCARG(uap, cmd) = KDGKBMODE;
 /* printf("ioctl KDGKBMODE = %x\n", SCARG(uap, cmd));*/
-	        return ioctl(p, (struct ioctl_args *)uap, retval);
+	        return ioctl(p, (struct ioctl_args *)uap);
 
 	case IBCS2_KDSKBMODE:        /* set keyboard translation mode */
 	        SCARG(uap, cmd) = KDSKBMODE;
-	        return ioctl(p, (struct ioctl_args *)uap, retval);
+	        return ioctl(p, (struct ioctl_args *)uap);
 
 	case IBCS2_KDMKTONE:        /* sound tone */
 	        SCARG(uap, cmd) = KDMKTONE;
-	        return ioctl(p, (struct ioctl_args *)uap, retval);
+	        return ioctl(p, (struct ioctl_args *)uap);
 
 	case IBCS2_KDGETMODE:        /* get text/graphics mode */  
 	        SCARG(uap, cmd) = KDGETMODE;
-	        return ioctl(p, (struct ioctl_args *)uap, retval);
+	        return ioctl(p, (struct ioctl_args *)uap);
 
 	case IBCS2_KDSETMODE:       /* set text/graphics mode */
 	        SCARG(uap, cmd) = KDSETMODE;
-	        return ioctl(p, (struct ioctl_args *)uap, retval);
+	        return ioctl(p, (struct ioctl_args *)uap);
 
 	case IBCS2_KDSBORDER:       /* set ega color border */
 	        SCARG(uap, cmd) = KDSBORDER;
-	        return ioctl(p, (struct ioctl_args *)uap, retval);
+	        return ioctl(p, (struct ioctl_args *)uap);
 
 	case IBCS2_KDGKBSTATE:
 	        SCARG(uap, cmd) = KDGKBSTATE;
-	        return ioctl(p, (struct ioctl_args *)uap, retval);
+	        return ioctl(p, (struct ioctl_args *)uap);
 
 	case IBCS2_KDSETRAD:
 	        SCARG(uap, cmd) = KDSETRAD;
-	        return ioctl(p, (struct ioctl_args *)uap, retval);
+	        return ioctl(p, (struct ioctl_args *)uap);
 
 	case IBCS2_KDENABIO:       /* enable direct I/O to ports */
 	        SCARG(uap, cmd) = KDENABIO;
-	        return ioctl(p, (struct ioctl_args *)uap, retval);
+	        return ioctl(p, (struct ioctl_args *)uap);
 
 	case IBCS2_KDDISABIO:       /* disable direct I/O to ports */
 	        SCARG(uap, cmd) = KDDISABIO;
-	        return ioctl(p, (struct ioctl_args *)uap, retval);
+	        return ioctl(p, (struct ioctl_args *)uap);
 
 	case IBCS2_KIOCSOUND:       /* start sound generation */
 	        SCARG(uap, cmd) = KIOCSOUND;
-	        return ioctl(p, (struct ioctl_args *)uap, retval);
+	        return ioctl(p, (struct ioctl_args *)uap);
 
 	case IBCS2_KDGKBTYPE:       /* get keyboard type */
 	        SCARG(uap, cmd) = KDGKBTYPE;
-	        return ioctl(p, (struct ioctl_args *)uap, retval);
+	        return ioctl(p, (struct ioctl_args *)uap);
 
 	case IBCS2_KDGETLED:       /* get keyboard LED status */
 	        SCARG(uap, cmd) = KDGETLED;
-	        return ioctl(p, (struct ioctl_args *)uap, retval);
+	        return ioctl(p, (struct ioctl_args *)uap);
 
 	case IBCS2_KDSETLED:       /* set keyboard LED status */
 	        SCARG(uap, cmd) = KDSETLED;
-	        return ioctl(p, (struct ioctl_args *)uap, retval);
+	        return ioctl(p, (struct ioctl_args *)uap);
 
 	    /* Xenix keyboard and display ioctl's from sys/kd.h -- type 'k' */
 	case IBCS2_GETFKEY:      /* Get function key */
 	        SCARG(uap, cmd) = GETFKEY;
-	        return ioctl(p, (struct ioctl_args *)uap, retval);
+	        return ioctl(p, (struct ioctl_args *)uap);
 
 	case IBCS2_SETFKEY:      /* Set function key */
 	        SCARG(uap, cmd) = SETFKEY;
-	        return ioctl(p, (struct ioctl_args *)uap, retval);
+	        return ioctl(p, (struct ioctl_args *)uap);
 
 	case IBCS2_GIO_SCRNMAP:      /* Get screen output map table */
 	        SCARG(uap, cmd) = GIO_SCRNMAP;
-	        return ioctl(p, (struct ioctl_args *)uap, retval);
+	        return ioctl(p, (struct ioctl_args *)uap);
 
 	case IBCS2_PIO_SCRNMAP:      /* Set screen output map table */
 	        SCARG(uap, cmd) = PIO_SCRNMAP;
-	        return ioctl(p, (struct ioctl_args *)uap, retval);
+	        return ioctl(p, (struct ioctl_args *)uap);
 
 	case IBCS2_GIO_KEYMAP:      /* Get keyboard map table */
 	        SCARG(uap, cmd) = GIO_KEYMAP;
-	        return ioctl(p, (struct ioctl_args *)uap, retval);
+	        return ioctl(p, (struct ioctl_args *)uap);
 
 	case IBCS2_PIO_KEYMAP:      /* Set keyboard map table */
 	        SCARG(uap, cmd) = PIO_KEYMAP;
-	        return ioctl(p, (struct ioctl_args *)uap, retval);
+	        return ioctl(p, (struct ioctl_args *)uap);
 
 	    /* socksys */
 	case IBCS2_SIOCSOCKSYS:
-		return ibcs2_socksys(p, (struct ibcs2_socksys_args *)uap,
-				     retval);
+		return ibcs2_socksys(p, (struct ibcs2_socksys_args *)uap);
 
 	case IBCS2_I_NREAD:     /* STREAMS */
 	        SCARG(uap, cmd) = FIONREAD;
-		return ioctl(p, (struct ioctl_args *)uap, retval);
+		return ioctl(p, (struct ioctl_args *)uap);
 
 	default:
 		DPRINTF(("ibcs2_ioctl(%d): unknown cmd 0x%lx ",
diff --git a/sys/i386/ibcs2/ibcs2_ipc.c b/sys/i386/ibcs2/ibcs2_ipc.c
index 824eb33..32f3fa3 100644
--- a/sys/i386/ibcs2/ibcs2_ipc.c
+++ b/sys/i386/ibcs2/ibcs2_ipc.c
@@ -22,7 +22,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: ibcs2_ipc.c,v 1.11 1997/03/24 11:23:31 bde Exp $
+ * $Id: ibcs2_ipc.c,v 1.12 1997/07/20 09:39:42 bde Exp $
  */
 
 #include <sys/param.h>
@@ -100,15 +100,14 @@ struct msqid_ds *bp;
 }
 
 int
-ibcs2_msgsys(p, uap, retval)
+ibcs2_msgsys(p, uap)
 	struct proc *p;
 	struct ibcs2_msgsys_args *uap;
-	int *retval;
 {
 	switch (SCARG(uap, which)) {
 	case 0:				/* msgget */
 		SCARG(uap, which) = 1;
-		return msgsys(p, (struct msgsys_args *)uap, retval);
+		return msgsys(p, (struct msgsys_args *)uap);
 	case 1: {			/* msgctl */
 		int error;
 		struct msgsys_args margs;
@@ -121,7 +120,7 @@ ibcs2_msgsys(p, uap, retval)
 		SCARG(&margs, a3) = SCARG(uap, a3);
 		switch (SCARG(&margs, a3)) {
 		case IBCS2_IPC_STAT:
-			error = msgsys(p, &margs, retval);
+			error = msgsys(p, &margs);
 			if (!error)
 				cvt_msqid2imsqid(
 				    (struct msqid_ds *)SCARG(&margs, a4),
@@ -131,18 +130,18 @@ ibcs2_msgsys(p, uap, retval)
 			cvt_imsqid2msqid((struct ibcs2_msqid_ds *)SCARG(uap,
 									a4),
 					 (struct msqid_ds *)SCARG(&margs, a4));
-			return msgsys(p, &margs, retval);
+			return msgsys(p, &margs);
 		case IBCS2_IPC_RMID:
-			return msgsys(p, &margs, retval);
+			return msgsys(p, &margs);
 		}
 		return EINVAL;
 	}
 	case 2:				/* msgrcv */
 		SCARG(uap, which) = 3;
-		return msgsys(p, (struct msgsys_args *)uap, retval);
+		return msgsys(p, (struct msgsys_args *)uap);
 	case 3:				/* msgsnd */
 		SCARG(uap, which) = 2;
-		return msgsys(p, (struct msgsys_args *)uap, retval);
+		return msgsys(p, (struct msgsys_args *)uap);
 	default:
 		return EINVAL;
 	}
@@ -204,10 +203,9 @@ struct semid_ds *bp;
 }
 
 int
-ibcs2_semsys(p, uap, retval)
+ibcs2_semsys(p, uap)
 	struct proc *p;
 	struct ibcs2_semsys_args *uap;
-	int *retval;
 {
 	int error;
 
@@ -223,7 +221,7 @@ ibcs2_semsys(p, uap, retval)
 			isp = (struct ibcs2_semid_ds *)SCARG(uap, a5);
 			sp = stackgap_alloc(&sg, sizeof(struct semid_ds));
 			SCARG(uap, a5) = (int)sp;
-			error = semsys(p, (struct semsys_args *)uap, retval);
+			error = semsys(p, (struct semsys_args *)uap);
 			if (!error) {
 				SCARG(uap, a5) = (int)isp;
 				isp = stackgap_alloc(&sg, sizeof(*isp));
@@ -248,7 +246,7 @@ ibcs2_semsys(p, uap, retval)
 				return error;
 			cvt_isemid2semid(isp, sp);
 			SCARG(uap, a5) = (int)sp;
-			return semsys(p, (struct semsys_args *)uap, retval);
+			return semsys(p, (struct semsys_args *)uap);
 		    }
 		case IBCS2_SETVAL:
 		    {
@@ -258,17 +256,17 @@ ibcs2_semsys(p, uap, retval)
 			sp = stackgap_alloc(&sg, sizeof(*sp));
 			sp->val = (int) SCARG(uap, a5);
 			SCARG(uap, a5) = (int)sp;
-			return semsys(p, (struct semsys_args *)uap, retval);
+			return semsys(p, (struct semsys_args *)uap);
 		    }
 		}
 
-		return semsys(p, (struct semsys_args *)uap, retval);
+		return semsys(p, (struct semsys_args *)uap);
 
 	case 1:				/* semget */
-		return semsys(p, (struct semsys_args *)uap, retval);
+		return semsys(p, (struct semsys_args *)uap);
 
 	case 2:				/* semop */
-		return semsys(p, (struct semsys_args *)uap, retval);
+		return semsys(p, (struct semsys_args *)uap);
 	}
 	return EINVAL;
 }
@@ -313,16 +311,15 @@ struct shmid_ds *bp;
 }
 
 int
-ibcs2_shmsys(p, uap, retval)
+ibcs2_shmsys(p, uap)
 	struct proc *p;
 	struct ibcs2_shmsys_args *uap;
-	int *retval;
 {
 	int error;
 
 	switch (SCARG(uap, which)) {
 	case 0:						/* shmat */
-		return shmsys(p, (struct shmsys_args *)uap, retval);
+		return shmsys(p, (struct shmsys_args *)uap);
 
 	case 1:						/* shmctl */
 		switch(SCARG(uap, a3)) {
@@ -335,7 +332,7 @@ ibcs2_shmsys(p, uap, retval)
 			isp = (struct ibcs2_shmid_ds *)SCARG(uap, a4);
 			sp = stackgap_alloc(&sg, sizeof(*sp));
 			SCARG(uap, a4) = (int)sp;
-			error = shmsys(p, (struct shmsys_args *)uap, retval);
+			error = shmsys(p, (struct shmsys_args *)uap);
 			if (!error) {
 				SCARG(uap, a4) = (int)isp;
 				isp = stackgap_alloc(&sg, sizeof(*isp));
@@ -360,17 +357,17 @@ ibcs2_shmsys(p, uap, retval)
 				return error;
 			cvt_ishmid2shmid(isp, sp);
 			SCARG(uap, a4) = (int)sp;
-			return shmsys(p, (struct shmsys_args *)uap, retval);
+			return shmsys(p, (struct shmsys_args *)uap);
 		    }
 		}
 
-		return shmsys(p, (struct shmsys_args *)uap, retval);
+		return shmsys(p, (struct shmsys_args *)uap);
 
 	case 2:						/* shmdt */
-		return shmsys(p, (struct shmsys_args *)uap, retval);
+		return shmsys(p, (struct shmsys_args *)uap);
 
 	case 3:						/* shmget */
-		return shmsys(p, (struct shmsys_args *)uap, retval);
+		return shmsys(p, (struct shmsys_args *)uap);
 	}
 	return EINVAL;
 }
diff --git a/sys/i386/ibcs2/ibcs2_isc.c b/sys/i386/ibcs2/ibcs2_isc.c
index c333450..8984141 100644
--- a/sys/i386/ibcs2/ibcs2_isc.c
+++ b/sys/i386/ibcs2/ibcs2_isc.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: ibcs2_isc.c,v 1.9 1997/05/07 20:05:44 peter Exp $
+ *	$Id: ibcs2_isc.c,v 1.10 1997/07/20 09:39:43 bde Exp $
  */
 
 #include <sys/param.h>
@@ -44,7 +44,7 @@
 extern struct sysent isc_sysent[];
 
 int
-ibcs2_isc(struct proc *p, struct ibcs2_isc_args *uap, int *retval)
+ibcs2_isc(struct proc *p, struct ibcs2_isc_args *uap)
 {
 	struct trapframe *tf = p->p_md.md_regs;
         struct sysent *callp;
@@ -54,7 +54,7 @@ ibcs2_isc(struct proc *p, struct ibcs2_isc_args *uap, int *retval)
 	callp = &isc_sysent[code];
 
 	if(code < IBCS2_ISC_MAXSYSCALL)
-	  return((*callp->sy_call)(p, (void *)uap, retval));
+	  return((*callp->sy_call)(p, (void *)uap));
 	else
 	  return ENOSYS;
 }
diff --git a/sys/i386/ibcs2/ibcs2_misc.c b/sys/i386/ibcs2/ibcs2_misc.c
index ad36679..dab0855 100644
--- a/sys/i386/ibcs2/ibcs2_misc.c
+++ b/sys/i386/ibcs2/ibcs2_misc.c
@@ -45,7 +45,7 @@
  *
  *	@(#)sun_misc.c	8.1 (Berkeley) 6/18/93
  *
- * $Id: ibcs2_misc.c,v 1.22 1997/07/20 09:39:44 bde Exp $
+ * $Id: ibcs2_misc.c,v 1.23 1997/08/25 21:56:23 bde Exp $
  */
 
 /*
@@ -85,10 +85,9 @@
 
 
 int
-ibcs2_ulimit(p, uap, retval)
+ibcs2_ulimit(p, uap)
 	struct proc *p;
 	struct ibcs2_ulimit_args *uap;
-	int *retval;
 {
 #ifdef notyet
 	int error;
@@ -105,31 +104,30 @@ ibcs2_ulimit(p, uap, retval)
 	
 	switch (SCARG(uap, cmd)) {
 	case IBCS2_GETFSIZE:
-		*retval = p->p_rlimit[RLIMIT_FSIZE].rlim_cur;
-		if (*retval == -1) *retval = 0x7fffffff;
+		p->p_retval[0] = p->p_rlimit[RLIMIT_FSIZE].rlim_cur;
+		if (p->p_retval[0] == -1) p->p_retval[0] = 0x7fffffff;
 		return 0;
 	case IBCS2_SETFSIZE:	/* XXX - fix this */
 #ifdef notyet
 		rl.rlim_cur = SCARG(uap, newlimit);
 		sra.resource = RLIMIT_FSIZE;
 		sra.rlp = &rl;
-		error = setrlimit(p, &sra, retval);
+		error = setrlimit(p, &sra);
 		if (!error)
-			*retval = p->p_rlimit[RLIMIT_FSIZE].rlim_cur;
+			p->p_retval[0] = p->p_rlimit[RLIMIT_FSIZE].rlim_cur;
 		else
 			DPRINTF(("failed "));
 		return error;
 #else
-		*retval = SCARG(uap, newlimit);
+		p->p_retval[0] = SCARG(uap, newlimit);
 		return 0;
 #endif
 	case IBCS2_GETPSIZE:
-		*retval = p->p_rlimit[RLIMIT_RSS].rlim_cur; /* XXX */
+		p->p_retval[0] = p->p_rlimit[RLIMIT_RSS].rlim_cur; /* XXX */
 		return 0;
 	case IBCS2_GETDTABLESIZE:
 		uap->cmd = IBCS2_SC_OPEN_MAX;
-		return ibcs2_sysconf(p, (struct ibcs2_sysconf_args *)uap,
-				     retval);
+		return ibcs2_sysconf(p, (struct ibcs2_sysconf_args *)uap);
 	default:
 		return ENOSYS;
 	}
@@ -138,10 +136,9 @@ ibcs2_ulimit(p, uap, retval)
 #define IBCS2_WSTOPPED       0177
 #define IBCS2_STOPCODE(sig)  ((sig) << 8 | IBCS2_WSTOPPED)
 int
-ibcs2_wait(p, uap, retval)
+ibcs2_wait(p, uap)
 	struct proc *p;
 	struct ibcs2_wait_args *uap;
-	int *retval;
 {
 	int error, status;
 	struct wait_args w4;
@@ -160,7 +157,7 @@ ibcs2_wait(p, uap, retval)
 		SCARG(&w4, status) = (int *)SCARG(uap, a1);
 		SCARG(&w4, options) = 0;
 	}
-	if ((error = wait4(p, &w4, retval)) != 0)
+	if ((error = wait4(p, &w4)) != 0)
 		return error;
 	if (SCARG(&w4, status))	{	/* this is real iBCS brain-damage */
 		error = copyin((caddr_t)SCARG(&w4, status), (caddr_t)&status,
@@ -177,7 +174,7 @@ ibcs2_wait(p, uap, retval)
 		/* else exit status -- identical */
 
 		/* record result/status */
-		retval[1] = status;
+		p->p_retval[1] = status;
 		return copyout((caddr_t)&status, (caddr_t)SCARG(&w4, status),
 			       sizeof(SCARG(&w4, status)));
 	}
@@ -186,10 +183,9 @@ ibcs2_wait(p, uap, retval)
 }
 
 int
-ibcs2_execv(p, uap, retval)
+ibcs2_execv(p, uap)
 	struct proc *p;
 	struct ibcs2_execv_args *uap;
-	int *retval;
 {
 	struct execve_args ea;
 	caddr_t sg = stackgap_init();
@@ -198,38 +194,35 @@ ibcs2_execv(p, uap, retval)
 	SCARG(&ea, fname) = SCARG(uap, path);
 	SCARG(&ea, argv) = SCARG(uap, argp);
 	SCARG(&ea, envv) = NULL;
-	return execve(p, &ea, retval);
+	return execve(p, &ea);
 }
 
 int
-ibcs2_execve(p, uap, retval) 
+ibcs2_execve(p, uap) 
         struct proc *p;
         struct ibcs2_execve_args *uap;
-        int *retval;
 {
         caddr_t sg = stackgap_init();
         CHECKALTEXIST(p, &sg, SCARG(uap, path));
-        return execve(p, (struct execve_args *)uap, retval);
+        return execve(p, (struct execve_args *)uap);
 }
 
 int
-ibcs2_umount(p, uap, retval)
+ibcs2_umount(p, uap)
 	struct proc *p;
 	struct ibcs2_umount_args *uap;
-	int *retval;
 {
 	struct unmount_args um;
 
 	SCARG(&um, path) = SCARG(uap, name);
 	SCARG(&um, flags) = 0;
-	return unmount(p, &um, retval);
+	return unmount(p, &um);
 }
 
 int
-ibcs2_mount(p, uap, retval)
+ibcs2_mount(p, uap)
 	struct proc *p;
 	struct ibcs2_mount_args *uap;
-	int *retval;
 {
 #ifdef notyet
 	int oflags = SCARG(uap, flags), nflags, error;
@@ -285,7 +278,7 @@ ibcs2_mount(p, uap, retval)
 		if (error = copyout(&na, SCARG(uap, data), sizeof na))
 			return (error);
 	}
-	return (mount(p, uap, retval));
+	return (mount(p, uap));
 #else
 	return EINVAL;
 #endif
@@ -300,10 +293,9 @@ ibcs2_mount(p, uap, retval)
  */
 
 int
-ibcs2_getdents(p, uap, retval)
+ibcs2_getdents(p, uap)
 	struct proc *p;
 	register struct ibcs2_getdents_args *uap;
-	int *retval;
 {
 	register struct vnode *vp;
 	register caddr_t inp, buf;	/* BSD-format */
@@ -432,7 +424,7 @@ again:
 		goto again;
 	fp->f_offset = off;		/* update the vnode offset */
 eof:
-	*retval = SCARG(uap, nbytes) - resid;
+	p->p_retval[0] = SCARG(uap, nbytes) - resid;
 out:
 	if (cookies)
 		free(cookies, M_TEMP);
@@ -442,10 +434,9 @@ out:
 }
 
 int
-ibcs2_read(p, uap, retval)
+ibcs2_read(p, uap)
 	struct proc *p;
 	struct ibcs2_read_args *uap;
-	int *retval;
 {
 	register struct vnode *vp;
 	register caddr_t inp, buf;	/* BSD-format */
@@ -466,7 +457,7 @@ ibcs2_read(p, uap, retval)
 
 	if (error = getvnode(p->p_fd, SCARG(uap, fd), &fp)) {
 		if (error == EINVAL)
-			return read(p, (struct read_args *)uap, retval);
+			return read(p, (struct read_args *)uap);
 		else
 			return error;
 	}
@@ -474,7 +465,7 @@ ibcs2_read(p, uap, retval)
 		return (EBADF);
 	vp = (struct vnode *)fp->f_data;
 	if (vp->v_type != VDIR)
-		return read(p, (struct read_args *)uap, retval);
+		return read(p, (struct read_args *)uap);
 
 	DPRINTF(("ibcs2_read: read directory\n"));
 
@@ -584,7 +575,7 @@ again:
 		goto again;
 	fp->f_offset = off;		/* update the vnode offset */
 eof:
-	*retval = SCARG(uap, nbytes) - resid;
+	p->p_retval[0] = SCARG(uap, nbytes) - resid;
 out:
 	if (cookies)
 		free(cookies, M_TEMP);
@@ -594,10 +585,9 @@ out:
 }
 
 int
-ibcs2_mknod(p, uap, retval)
+ibcs2_mknod(p, uap)
 	struct proc *p;
 	struct ibcs2_mknod_args *uap;
-	int *retval;
 {
         caddr_t sg = stackgap_init();
 
@@ -606,21 +596,20 @@ ibcs2_mknod(p, uap, retval)
                 struct mkfifo_args ap;
                 SCARG(&ap, path) = SCARG(uap, path);
                 SCARG(&ap, mode) = SCARG(uap, mode);
-		return mkfifo(p, &ap, retval);
+		return mkfifo(p, &ap);
 	} else {
                 struct mknod_args ap;
                 SCARG(&ap, path) = SCARG(uap, path);
                 SCARG(&ap, mode) = SCARG(uap, mode);
                 SCARG(&ap, dev) = SCARG(uap, dev);
-                return mknod(p, &ap, retval);
+                return mknod(p, &ap);
 	}
 }
 
 int
-ibcs2_getgroups(p, uap, retval)
+ibcs2_getgroups(p, uap)
 	struct proc *p;
 	struct ibcs2_getgroups_args *uap;
-	int *retval;
 {
 	int error, i;
 	ibcs2_gid_t *iset;
@@ -635,25 +624,24 @@ ibcs2_getgroups(p, uap, retval)
 		iset = stackgap_alloc(&sg, SCARG(uap, gidsetsize) *
 				      sizeof(ibcs2_gid_t));
 	}
-	if (error = getgroups(p, &sa, retval))
+	if (error = getgroups(p, &sa))
 		return error;
 	if (SCARG(uap, gidsetsize) == 0)
 		return 0;
 
-	for (i = 0, gp = SCARG(&sa, gidset); i < retval[0]; i++)
+	for (i = 0, gp = SCARG(&sa, gidset); i < p->p_retval[0]; i++)
 		iset[i] = (ibcs2_gid_t)*gp++;
-	if (retval[0] && (error = copyout((caddr_t)iset,
+	if (p->p_retval[0] && (error = copyout((caddr_t)iset,
 					  (caddr_t)SCARG(uap, gidset),
-					  sizeof(ibcs2_gid_t) * retval[0])))
+					  sizeof(ibcs2_gid_t) * p->p_retval[0])))
 		return error;
         return 0;
 }
 
 int
-ibcs2_setgroups(p, uap, retval)
+ibcs2_setgroups(p, uap)
 	struct proc *p;
 	struct ibcs2_setgroups_args *uap;
-	int *retval;
 {
 	int error, i;
 	ibcs2_gid_t *iset;
@@ -674,43 +662,40 @@ ibcs2_setgroups(p, uap, retval)
 	}
 	for (i = 0, gp = SCARG(&sa, gidset); i < SCARG(&sa, gidsetsize); i++)
 		*gp++ = (gid_t)iset[i];
-	return setgroups(p, &sa, retval);
+	return setgroups(p, &sa);
 }
 
 int
-ibcs2_setuid(p, uap, retval)
+ibcs2_setuid(p, uap)
 	struct proc *p;
 	struct ibcs2_setuid_args *uap;
-	int *retval;
 {
 	struct setuid_args sa;
 
 	SCARG(&sa, uid) = (uid_t)SCARG(uap, uid);
-	return setuid(p, &sa, retval);
+	return setuid(p, &sa);
 }
 
 int
-ibcs2_setgid(p, uap, retval)
+ibcs2_setgid(p, uap)
 	struct proc *p;
 	struct ibcs2_setgid_args *uap;
-	int *retval;
 {
 	struct setgid_args sa;
 
 	SCARG(&sa, gid) = (gid_t)SCARG(uap, gid);
-	return setgid(p, &sa, retval);
+	return setgid(p, &sa);
 }
 
 int
-ibcs2_time(p, uap, retval)
+ibcs2_time(p, uap)
 	struct proc *p;
 	struct ibcs2_time_args *uap;
-	int *retval;
 {
 	struct timeval tv;
 
 	microtime(&tv);
-	*retval = tv.tv_sec;
+	p->p_retval[0] = tv.tv_sec;
 	if (SCARG(uap, tp))
 		return copyout((caddr_t)&tv.tv_sec, (caddr_t)SCARG(uap, tp),
 			       sizeof(ibcs2_time_t));
@@ -719,30 +704,27 @@ ibcs2_time(p, uap, retval)
 }
 
 int
-ibcs2_pathconf(p, uap, retval)
+ibcs2_pathconf(p, uap)
 	struct proc *p;
 	struct ibcs2_pathconf_args *uap;
-	int *retval;
 {
 	SCARG(uap, name)++;	/* iBCS2 _PC_* defines are offset by one */
-        return pathconf(p, (struct pathconf_args *)uap, retval);
+        return pathconf(p, (struct pathconf_args *)uap);
 }
 
 int
-ibcs2_fpathconf(p, uap, retval)
+ibcs2_fpathconf(p, uap)
 	struct proc *p;
 	struct ibcs2_fpathconf_args *uap;
-	int *retval;
 {
 	SCARG(uap, name)++;	/* iBCS2 _PC_* defines are offset by one */
-        return fpathconf(p, (struct fpathconf_args *)uap, retval);
+        return fpathconf(p, (struct fpathconf_args *)uap);
 }
 
 int
-ibcs2_sysconf(p, uap, retval)
+ibcs2_sysconf(p, uap)
 	struct proc *p;
 	struct ibcs2_sysconf_args *uap;
-	int *retval;
 {
 	int mib[2], value, len, error;
 	struct sysctl_args sa;
@@ -759,14 +741,14 @@ ibcs2_sysconf(p, uap, retval)
 
 		SCARG(&ga, which) = RLIMIT_NPROC;
 		SCARG(&ga, rlp) = stackgap_alloc(&sg, sizeof(struct rlimit *));
-		if (error = getrlimit(p, &ga, retval))
+		if (error = getrlimit(p, &ga))
 			return error;
-		*retval = SCARG(&ga, rlp)->rlim_cur;
+		p->p_retval[0] = SCARG(&ga, rlp)->rlim_cur;
 		return 0;
 	    }
 
 	case IBCS2_SC_CLK_TCK:
-		*retval = hz;
+		p->p_retval[0] = hz;
 		return 0;
 
 	case IBCS2_SC_NGROUPS_MAX:
@@ -779,9 +761,9 @@ ibcs2_sysconf(p, uap, retval)
 
 		SCARG(&ga, which) = RLIMIT_NOFILE;
 		SCARG(&ga, rlp) = stackgap_alloc(&sg, sizeof(struct rlimit *));
-		if (error = getrlimit(p, &ga, retval))
+		if (error = getrlimit(p, &ga))
 			return error;
-		*retval = SCARG(&ga, rlp)->rlim_cur;
+		p->p_retval[0] = SCARG(&ga, rlp)->rlim_cur;
 		return 0;
 	    }
 		
@@ -798,11 +780,11 @@ ibcs2_sysconf(p, uap, retval)
 		break;
 		
 	case IBCS2_SC_PASS_MAX:
-		*retval = 128;		/* XXX - should we create PASS_MAX ? */
+		p->p_retval[0] = 128;		/* XXX - should we create PASS_MAX ? */
 		return 0;
 
 	case IBCS2_SC_XOPEN_VERSION:
-		*retval = 2;		/* XXX: What should that be? */
+		p->p_retval[0] = 2;		/* XXX: What should that be? */
 		return 0;
 		
 	default:
@@ -817,17 +799,16 @@ ibcs2_sysconf(p, uap, retval)
 	SCARG(&sa, oldlenp) = &len;
 	SCARG(&sa, new) = NULL;
 	SCARG(&sa, newlen) = 0;
-	if (error = __sysctl(p, &sa, retval))
+	if (error = __sysctl(p, &sa))
 		return error;
-	*retval = value;
+	p->p_retval[0] = value;
 	return 0;
 }
 
 int
-ibcs2_alarm(p, uap, retval)
+ibcs2_alarm(p, uap)
 	struct proc *p;
 	struct ibcs2_alarm_args *uap;
-	int *retval;
 {
 	int error;
         struct itimerval *itp, *oitp;
@@ -843,20 +824,19 @@ ibcs2_alarm(p, uap, retval)
 	SCARG(&sa, which) = ITIMER_REAL;
 	SCARG(&sa, itv) = itp;
 	SCARG(&sa, oitv) = oitp;
-        error = setitimer(p, &sa, retval);
+        error = setitimer(p, &sa);
 	if (error)
 		return error;
         if (oitp->it_value.tv_usec)
                 oitp->it_value.tv_sec++;
-        *retval = oitp->it_value.tv_sec;
+        p->p_retval[0] = oitp->it_value.tv_sec;
         return 0;
 }
 
 int
-ibcs2_times(p, uap, retval)
+ibcs2_times(p, uap)
 	struct proc *p;
 	struct ibcs2_times_args *uap;
-	int *retval;
 {
 	int error;
 	struct getrusage_args ga;
@@ -868,31 +848,30 @@ ibcs2_times(p, uap, retval)
 
 	SCARG(&ga, who) = RUSAGE_SELF;
 	SCARG(&ga, rusage) = ru;
-	error = getrusage(p, &ga, retval);
+	error = getrusage(p, &ga);
 	if (error)
                 return error;
         tms.tms_utime = CONVTCK(ru->ru_utime);
         tms.tms_stime = CONVTCK(ru->ru_stime);
 
 	SCARG(&ga, who) = RUSAGE_CHILDREN;
-        error = getrusage(p, &ga, retval);
+        error = getrusage(p, &ga);
 	if (error)
 		return error;
         tms.tms_cutime = CONVTCK(ru->ru_utime);
         tms.tms_cstime = CONVTCK(ru->ru_stime);
 
 	microtime(&t);
-        *retval = CONVTCK(t);
+        p->p_retval[0] = CONVTCK(t);
 	
 	return copyout((caddr_t)&tms, (caddr_t)SCARG(uap, tp),
 		       sizeof(struct tms));
 }
 
 int
-ibcs2_stime(p, uap, retval)
+ibcs2_stime(p, uap)
 	struct proc *p;
 	struct ibcs2_stime_args *uap;
-	int *retval;
 {
 	int error;
 	struct settimeofday_args sa;
@@ -904,16 +883,15 @@ ibcs2_stime(p, uap, retval)
 			   &(SCARG(&sa, tv)->tv_sec), sizeof(long)))
 		return error;
 	SCARG(&sa, tv)->tv_usec = 0;
-	if (error = settimeofday(p, &sa, retval))
+	if (error = settimeofday(p, &sa))
 		return EPERM;
 	return 0;
 }
 
 int
-ibcs2_utime(p, uap, retval)
+ibcs2_utime(p, uap)
 	struct proc *p;
 	struct ibcs2_utime_args *uap;
-	int *retval;
 {
 	int error;
 	struct utimes_args sa;
@@ -938,14 +916,13 @@ ibcs2_utime(p, uap, retval)
 		tp->tv_usec = 0;
 	} else
 		SCARG(&sa, tptr) = NULL;
-	return utimes(p, &sa, retval);
+	return utimes(p, &sa);
 }
 
 int
-ibcs2_nice(p, uap, retval)
+ibcs2_nice(p, uap)
 	struct proc *p;
 	struct ibcs2_nice_args *uap;
-	int *retval;
 {
 	int error;
 	struct setpriority_args sa;
@@ -953,9 +930,9 @@ ibcs2_nice(p, uap, retval)
 	SCARG(&sa, which) = PRIO_PROCESS;
 	SCARG(&sa, who) = 0;
 	SCARG(&sa, prio) = p->p_nice + SCARG(uap, incr);
-	if (error = setpriority(p, &sa, retval))
+	if (error = setpriority(p, &sa))
 		return EPERM;
-	*retval = p->p_nice;
+	p->p_retval[0] = p->p_nice;
 	return 0;
 }
 
@@ -964,14 +941,13 @@ ibcs2_nice(p, uap, retval)
  */
 
 int
-ibcs2_pgrpsys(p, uap, retval)
+ibcs2_pgrpsys(p, uap)
 	struct proc *p;
 	struct ibcs2_pgrpsys_args *uap;
-	int *retval;
 {
 	switch (SCARG(uap, type)) {
 	case 0:			/* getpgrp */
-		*retval = p->p_pgrp->pg_id;
+		p->p_retval[0] = p->p_pgrp->pg_id;
 		return 0;
 
 	case 1:			/* setpgrp */
@@ -980,8 +956,8 @@ ibcs2_pgrpsys(p, uap, retval)
 
 		SCARG(&sa, pid) = 0;
 		SCARG(&sa, pgid) = 0;
-		setpgid(p, &sa, retval);
-		*retval = p->p_pgrp->pg_id;
+		setpgid(p, &sa);
+		p->p_retval[0] = p->p_pgrp->pg_id;
 		return 0;
 	    }
 
@@ -991,11 +967,11 @@ ibcs2_pgrpsys(p, uap, retval)
 
 		SCARG(&sa, pid) = SCARG(uap, pid);
 		SCARG(&sa, pgid) = SCARG(uap, pgid);
-		return setpgid(p, &sa, retval);
+		return setpgid(p, &sa);
 	    }
 
 	case 3:			/* setsid */
-		return setsid(p, NULL, retval);
+		return setsid(p, NULL);
 
 	default:
 		return EINVAL;
@@ -1007,10 +983,9 @@ ibcs2_pgrpsys(p, uap, retval)
  */
 
 int
-ibcs2_plock(p, uap, retval)
+ibcs2_plock(p, uap)
 	struct proc *p;
 	struct ibcs2_plock_args *uap;
-	int *retval;
 {
 	int error;
 #define IBCS2_UNLOCK	0
@@ -1032,10 +1007,9 @@ ibcs2_plock(p, uap, retval)
 }
 
 int
-ibcs2_uadmin(p, uap, retval)
+ibcs2_uadmin(p, uap)
 	struct proc *p;
 	struct ibcs2_uadmin_args *uap;
-	int *retval;
 {
 #define SCO_A_REBOOT        1
 #define SCO_A_SHUTDOWN      2
@@ -1067,11 +1041,11 @@ ibcs2_uadmin(p, uap, retval)
 		case SCO_AD_PWRDOWN:
 		case SCO_AD_PWRNAP:
 			r.opt = RB_HALT;
-			reboot(p, &r, retval);
+			reboot(p, &r);
 		case SCO_AD_BOOT:
 		case SCO_AD_IBOOT:
 			r.opt = RB_AUTOBOOT;
-			reboot(p, &r, retval);
+			reboot(p, &r);
 		}
 		return EINVAL;
 	case SCO_A_REMOUNT:
@@ -1085,10 +1059,9 @@ ibcs2_uadmin(p, uap, retval)
 }
 
 int
-ibcs2_sysfs(p, uap, retval)
+ibcs2_sysfs(p, uap)
 	struct proc *p;
 	struct ibcs2_sysfs_args *uap;
-	int *retval;
 {
 #define IBCS2_GETFSIND        1
 #define IBCS2_GETFSTYP        2
@@ -1104,111 +1077,102 @@ ibcs2_sysfs(p, uap, retval)
 }
 
 int
-ibcs2_unlink(p, uap, retval)
+ibcs2_unlink(p, uap)
 	struct proc *p;
 	struct ibcs2_unlink_args *uap;
-	int *retval;
 {
         caddr_t sg = stackgap_init();
 
 	CHECKALTEXIST(p, &sg, SCARG(uap, path));
-	return unlink(p, (struct unlink_args *)uap, retval);
+	return unlink(p, (struct unlink_args *)uap);
 }
 
 int
-ibcs2_chdir(p, uap, retval)
+ibcs2_chdir(p, uap)
 	struct proc *p;
 	struct ibcs2_chdir_args *uap;
-	int *retval;
 {
         caddr_t sg = stackgap_init();
 
 	CHECKALTEXIST(p, &sg, SCARG(uap, path));
-	return chdir(p, (struct chdir_args *)uap, retval);
+	return chdir(p, (struct chdir_args *)uap);
 }
 
 int
-ibcs2_chmod(p, uap, retval)
+ibcs2_chmod(p, uap)
 	struct proc *p;
 	struct ibcs2_chmod_args *uap;
-	int *retval;
 {
         caddr_t sg = stackgap_init();
 
 	CHECKALTEXIST(p, &sg, SCARG(uap, path));
-	return chmod(p, (struct chmod_args *)uap, retval);
+	return chmod(p, (struct chmod_args *)uap);
 }
 
 int
-ibcs2_chown(p, uap, retval)
+ibcs2_chown(p, uap)
 	struct proc *p;
 	struct ibcs2_chown_args *uap;
-	int *retval;
 {
         caddr_t sg = stackgap_init();
 
 	CHECKALTEXIST(p, &sg, SCARG(uap, path));
-	return chown(p, (struct chown_args *)uap, retval);
+	return chown(p, (struct chown_args *)uap);
 }
 
 int
-ibcs2_rmdir(p, uap, retval)
+ibcs2_rmdir(p, uap)
 	struct proc *p;
 	struct ibcs2_rmdir_args *uap;
-	int *retval;
 {
         caddr_t sg = stackgap_init();
 
 	CHECKALTEXIST(p, &sg, SCARG(uap, path));
-	return rmdir(p, (struct rmdir_args *)uap, retval);
+	return rmdir(p, (struct rmdir_args *)uap);
 }
 
 int
-ibcs2_mkdir(p, uap, retval)
+ibcs2_mkdir(p, uap)
 	struct proc *p;
 	struct ibcs2_mkdir_args *uap;
-	int *retval;
 {
         caddr_t sg = stackgap_init();
 
 	CHECKALTCREAT(p, &sg, SCARG(uap, path));
-	return mkdir(p, (struct mkdir_args *)uap, retval);
+	return mkdir(p, (struct mkdir_args *)uap);
 }
 
 int
-ibcs2_symlink(p, uap, retval)
+ibcs2_symlink(p, uap)
 	struct proc *p;
 	struct ibcs2_symlink_args *uap;
-	int *retval;
 {
         caddr_t sg = stackgap_init();
 
 	CHECKALTEXIST(p, &sg, SCARG(uap, path));
 	CHECKALTCREAT(p, &sg, SCARG(uap, link));
-	return symlink(p, (struct symlink_args *)uap, retval);
+	return symlink(p, (struct symlink_args *)uap);
 }
 
 int
-ibcs2_rename(p, uap, retval)
+ibcs2_rename(p, uap)
 	struct proc *p;
 	struct ibcs2_rename_args *uap;
-	int *retval;
 {
         caddr_t sg = stackgap_init();
 
 	CHECKALTEXIST(p, &sg, SCARG(uap, from));
 	CHECKALTCREAT(p, &sg, SCARG(uap, to));
-	return rename(p, (struct rename_args *)uap, retval);
+	return rename(p, (struct rename_args *)uap);
 }
 
 int
-ibcs2_readlink(p, uap, retval)
+ibcs2_readlink(p, uap)
 	struct proc *p;
 	struct ibcs2_readlink_args *uap;
-	int *retval;
 {
         caddr_t sg = stackgap_init();
 
 	CHECKALTEXIST(p, &sg, SCARG(uap, path));
-	return readlink(p, (struct readlink_args *) uap, retval);
+	return readlink(p, (struct readlink_args *) uap);
 }
diff --git a/sys/i386/ibcs2/ibcs2_msg.c b/sys/i386/ibcs2/ibcs2_msg.c
index 8617190..ba2af2d 100644
--- a/sys/i386/ibcs2/ibcs2_msg.c
+++ b/sys/i386/ibcs2/ibcs2_msg.c
@@ -21,7 +21,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: ibcs2_msg.c,v 1.3 1997/02/22 09:33:23 peter Exp $
+ * $Id: ibcs2_msg.c,v 1.4 1997/07/20 09:39:44 bde Exp $
  */
 
 /*
@@ -41,29 +41,26 @@
 
 
 int
-ibcs2_getmsg(p, uap, retval)
+ibcs2_getmsg(p, uap)
 	struct proc *p;
 	struct ibcs2_getmsg_args *uap;
-	int *retval;
 {
 	return 0; /* fake */
 }
 
 int
-ibcs2_putmsg(p, uap, retval)
+ibcs2_putmsg(p, uap)
 	struct proc *p;
 	struct ibcs2_putmsg_args *uap;
-	int *retval;
 {
 	return 0; /* fake */
 }
 
 
 int
-ibcs2_poll(p, uap, retval)
+ibcs2_poll(p, uap)
 	struct proc *p;
 	struct ibcs2_poll_args *uap;
-	int *retval;
 {
 	int error, i;
 	fd_set *readfds, *writefds, *exceptfds;
@@ -110,12 +107,12 @@ ibcs2_poll(p, uap, retval)
 			FD_SET(conv.fd, writefds);
 		FD_SET(conv.fd, exceptfds);
 	}
-	if (error = select(p, &tmp_select, retval))
+	if (error = select(p, &tmp_select))
 		return error;
-	if (*retval == 0)
+	if (p->p_retval[0] == 0)
 		return 0;
-	*retval = 0;
-	for (*retval = 0, i = 0; i < uap->nfds; i++) {
+	p->p_retval[0] = 0;
+	for (p->p_retval[0] = 0, i = 0; i < uap->nfds; i++) {
 		copyin(uap->fds + i*sizeof(struct ibcs2_poll),
 		       &conv, sizeof(conv));
 		conv.revents = 0;
@@ -130,7 +127,7 @@ ibcs2_poll(p, uap, retval)
 			if (FD_ISSET(conv.fd, exceptfds))
 				conv.revents |= IBCS2_POLLERR;
 			if (conv.revents)
-				++*retval;
+				++p->p_retval[0];
 		}
 		if (error = copyout(&conv,
 				    uap->fds + i*sizeof(struct ibcs2_poll),
diff --git a/sys/i386/ibcs2/ibcs2_other.c b/sys/i386/ibcs2/ibcs2_other.c
index 21e9f28..621a382 100644
--- a/sys/i386/ibcs2/ibcs2_other.c
+++ b/sys/i386/ibcs2/ibcs2_other.c
@@ -21,7 +21,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: ibcs2_other.c,v 1.6 1997/07/20 09:39:45 bde Exp $
+ * $Id: ibcs2_other.c,v 1.7 1997/08/25 21:57:55 bde Exp $
  */
 
 /*
@@ -41,12 +41,12 @@
 #define IBCS2_SECURE_SETLUID 2
 
 int
-ibcs2_secure(struct proc *p, struct ibcs2_secure_args *uap, int *retval)
+ibcs2_secure(struct proc *p, struct ibcs2_secure_args *uap)
 {
 	switch (uap->cmd) {
 
 	case IBCS2_SECURE_GETLUID:		/* get login uid */
-		*retval = p->p_ucred->cr_uid;
+		p->p_retval[0] = p->p_ucred->cr_uid;
 		return 0;
 
 	case IBCS2_SECURE_SETLUID:		/* set login uid */
@@ -60,17 +60,15 @@ ibcs2_secure(struct proc *p, struct ibcs2_secure_args *uap, int *retval)
 }
 
 int
-ibcs2_lseek(struct proc *p, register struct ibcs2_lseek_args *uap, int *retval)
+ibcs2_lseek(struct proc *p, register struct ibcs2_lseek_args *uap)
 {
 	struct lseek_args largs;
-	off_t lret;
 	int error;
 
 	largs.fd = uap->fd;
 	largs.offset = uap->offset;
 	largs.whence = uap->whence;
-	error = lseek(p, &largs, (int *)&lret);
-	*(long *)retval = lret;
+	error = lseek(p, &largs);
 	return (error);
 }
 
@@ -79,7 +77,7 @@ ibcs2_lseek(struct proc *p, register struct ibcs2_lseek_args *uap, int *retval)
 #include <sys/un.h>     
 
 int
-spx_open(struct proc *p, void *uap, int *retval)
+spx_open(struct proc *p, void *uap)
 {
 	struct socket_args sock;
 	struct connect_args conn;
@@ -92,7 +90,7 @@ spx_open(struct proc *p, void *uap, int *retval)
 	sock.domain = AF_UNIX;
 	sock.type = SOCK_STREAM;
 	sock.protocol = 0;
-	error = socket(p, &sock, retval);
+	error = socket(p, &sock);
 	if (error)
 		return error;
 
@@ -104,17 +102,17 @@ spx_open(struct proc *p, void *uap, int *retval)
 	  strlen(Xaddr->sun_path) + 1;
 	copyout("/tmp/.X11-unix/X0", Xaddr->sun_path, 18);
 
-	conn.s = fd = *retval;
+	conn.s = fd = p->p_retval[0];
 	conn.name = (caddr_t)Xaddr;
 	conn.namelen = sizeof(struct sockaddr_un);
-	error = connect(p, &conn, retval);
+	error = connect(p, &conn);
 	if (error) {
 		struct close_args cl;
 		cl.fd = fd;
-		close(p, &cl, retval);
+		close(p, &cl);
 		return error;
 	}
-	*retval = fd;
+	p->p_retval[0] = fd;
 	return 0;
 }
 #endif /* SPX_HACK */
diff --git a/sys/i386/ibcs2/ibcs2_proto.h b/sys/i386/ibcs2/ibcs2_proto.h
index 06d4351..75ea03e 100644
--- a/sys/i386/ibcs2/ibcs2_proto.h
+++ b/sys/i386/ibcs2/ibcs2_proto.h
@@ -265,62 +265,62 @@ struct	ibcs2_readlink_args {
 struct	ibcs2_isc_args {
 	int dummy;
 };
-int	ibcs2_read __P((struct proc *, struct ibcs2_read_args *, int []));
-int	ibcs2_open __P((struct proc *, struct ibcs2_open_args *, int []));
-int	ibcs2_wait __P((struct proc *, struct ibcs2_wait_args *, int []));
-int	ibcs2_creat __P((struct proc *, struct ibcs2_creat_args *, int []));
-int	ibcs2_unlink __P((struct proc *, struct ibcs2_unlink_args *, int []));
-int	ibcs2_execv __P((struct proc *, struct ibcs2_execv_args *, int []));
-int	ibcs2_chdir __P((struct proc *, struct ibcs2_chdir_args *, int []));
-int	ibcs2_time __P((struct proc *, struct ibcs2_time_args *, int []));
-int	ibcs2_mknod __P((struct proc *, struct ibcs2_mknod_args *, int []));
-int	ibcs2_chmod __P((struct proc *, struct ibcs2_chmod_args *, int []));
-int	ibcs2_chown __P((struct proc *, struct ibcs2_chown_args *, int []));
-int	ibcs2_stat __P((struct proc *, struct ibcs2_stat_args *, int []));
-int	ibcs2_lseek __P((struct proc *, struct ibcs2_lseek_args *, int []));
-int	ibcs2_mount __P((struct proc *, struct ibcs2_mount_args *, int []));
-int	ibcs2_umount __P((struct proc *, struct ibcs2_umount_args *, int []));
-int	ibcs2_setuid __P((struct proc *, struct ibcs2_setuid_args *, int []));
-int	ibcs2_stime __P((struct proc *, struct ibcs2_stime_args *, int []));
-int	ibcs2_alarm __P((struct proc *, struct ibcs2_alarm_args *, int []));
-int	ibcs2_fstat __P((struct proc *, struct ibcs2_fstat_args *, int []));
-int	ibcs2_pause __P((struct proc *, struct ibcs2_pause_args *, int []));
-int	ibcs2_utime __P((struct proc *, struct ibcs2_utime_args *, int []));
-int	ibcs2_stty __P((struct proc *, struct ibcs2_stty_args *, int []));
-int	ibcs2_gtty __P((struct proc *, struct ibcs2_gtty_args *, int []));
-int	ibcs2_access __P((struct proc *, struct ibcs2_access_args *, int []));
-int	ibcs2_nice __P((struct proc *, struct ibcs2_nice_args *, int []));
-int	ibcs2_statfs __P((struct proc *, struct ibcs2_statfs_args *, int []));
-int	ibcs2_kill __P((struct proc *, struct ibcs2_kill_args *, int []));
-int	ibcs2_fstatfs __P((struct proc *, struct ibcs2_fstatfs_args *, int []));
-int	ibcs2_pgrpsys __P((struct proc *, struct ibcs2_pgrpsys_args *, int []));
-int	ibcs2_xenix __P((struct proc *, struct ibcs2_xenix_args *, int []));
-int	ibcs2_times __P((struct proc *, struct ibcs2_times_args *, int []));
-int	ibcs2_plock __P((struct proc *, struct ibcs2_plock_args *, int []));
-int	ibcs2_setgid __P((struct proc *, struct ibcs2_setgid_args *, int []));
-int	ibcs2_sigsys __P((struct proc *, struct ibcs2_sigsys_args *, int []));
-int	ibcs2_msgsys __P((struct proc *, struct ibcs2_msgsys_args *, int []));
-int	ibcs2_sysi86 __P((struct proc *, struct ibcs2_sysi86_args *, int []));
-int	ibcs2_shmsys __P((struct proc *, struct ibcs2_shmsys_args *, int []));
-int	ibcs2_semsys __P((struct proc *, struct ibcs2_semsys_args *, int []));
-int	ibcs2_ioctl __P((struct proc *, struct ibcs2_ioctl_args *, int []));
-int	ibcs2_uadmin __P((struct proc *, struct ibcs2_uadmin_args *, int []));
-int	ibcs2_utssys __P((struct proc *, struct ibcs2_utssys_args *, int []));
-int	ibcs2_execve __P((struct proc *, struct ibcs2_execve_args *, int []));
-int	ibcs2_fcntl __P((struct proc *, struct ibcs2_fcntl_args *, int []));
-int	ibcs2_ulimit __P((struct proc *, struct ibcs2_ulimit_args *, int []));
-int	ibcs2_rmdir __P((struct proc *, struct ibcs2_rmdir_args *, int []));
-int	ibcs2_mkdir __P((struct proc *, struct ibcs2_mkdir_args *, int []));
-int	ibcs2_getdents __P((struct proc *, struct ibcs2_getdents_args *, int []));
-int	ibcs2_sysfs __P((struct proc *, struct ibcs2_sysfs_args *, int []));
-int	ibcs2_getmsg __P((struct proc *, struct ibcs2_getmsg_args *, int []));
-int	ibcs2_putmsg __P((struct proc *, struct ibcs2_putmsg_args *, int []));
-int	ibcs2_poll __P((struct proc *, struct ibcs2_poll_args *, int []));
-int	ibcs2_secure __P((struct proc *, struct ibcs2_secure_args *, int []));
-int	ibcs2_symlink __P((struct proc *, struct ibcs2_symlink_args *, int []));
-int	ibcs2_lstat __P((struct proc *, struct ibcs2_lstat_args *, int []));
-int	ibcs2_readlink __P((struct proc *, struct ibcs2_readlink_args *, int []));
-int	ibcs2_isc __P((struct proc *, struct ibcs2_isc_args *, int []));
+int	ibcs2_read __P((struct proc *, struct ibcs2_read_args *));
+int	ibcs2_open __P((struct proc *, struct ibcs2_open_args *));
+int	ibcs2_wait __P((struct proc *, struct ibcs2_wait_args *));
+int	ibcs2_creat __P((struct proc *, struct ibcs2_creat_args *));
+int	ibcs2_unlink __P((struct proc *, struct ibcs2_unlink_args *));
+int	ibcs2_execv __P((struct proc *, struct ibcs2_execv_args *));
+int	ibcs2_chdir __P((struct proc *, struct ibcs2_chdir_args *));
+int	ibcs2_time __P((struct proc *, struct ibcs2_time_args *));
+int	ibcs2_mknod __P((struct proc *, struct ibcs2_mknod_args *));
+int	ibcs2_chmod __P((struct proc *, struct ibcs2_chmod_args *));
+int	ibcs2_chown __P((struct proc *, struct ibcs2_chown_args *));
+int	ibcs2_stat __P((struct proc *, struct ibcs2_stat_args *));
+int	ibcs2_lseek __P((struct proc *, struct ibcs2_lseek_args *));
+int	ibcs2_mount __P((struct proc *, struct ibcs2_mount_args *));
+int	ibcs2_umount __P((struct proc *, struct ibcs2_umount_args *));
+int	ibcs2_setuid __P((struct proc *, struct ibcs2_setuid_args *));
+int	ibcs2_stime __P((struct proc *, struct ibcs2_stime_args *));
+int	ibcs2_alarm __P((struct proc *, struct ibcs2_alarm_args *));
+int	ibcs2_fstat __P((struct proc *, struct ibcs2_fstat_args *));
+int	ibcs2_pause __P((struct proc *, struct ibcs2_pause_args *));
+int	ibcs2_utime __P((struct proc *, struct ibcs2_utime_args *));
+int	ibcs2_stty __P((struct proc *, struct ibcs2_stty_args *));
+int	ibcs2_gtty __P((struct proc *, struct ibcs2_gtty_args *));
+int	ibcs2_access __P((struct proc *, struct ibcs2_access_args *));
+int	ibcs2_nice __P((struct proc *, struct ibcs2_nice_args *));
+int	ibcs2_statfs __P((struct proc *, struct ibcs2_statfs_args *));
+int	ibcs2_kill __P((struct proc *, struct ibcs2_kill_args *));
+int	ibcs2_fstatfs __P((struct proc *, struct ibcs2_fstatfs_args *));
+int	ibcs2_pgrpsys __P((struct proc *, struct ibcs2_pgrpsys_args *));
+int	ibcs2_xenix __P((struct proc *, struct ibcs2_xenix_args *));
+int	ibcs2_times __P((struct proc *, struct ibcs2_times_args *));
+int	ibcs2_plock __P((struct proc *, struct ibcs2_plock_args *));
+int	ibcs2_setgid __P((struct proc *, struct ibcs2_setgid_args *));
+int	ibcs2_sigsys __P((struct proc *, struct ibcs2_sigsys_args *));
+int	ibcs2_msgsys __P((struct proc *, struct ibcs2_msgsys_args *));
+int	ibcs2_sysi86 __P((struct proc *, struct ibcs2_sysi86_args *));
+int	ibcs2_shmsys __P((struct proc *, struct ibcs2_shmsys_args *));
+int	ibcs2_semsys __P((struct proc *, struct ibcs2_semsys_args *));
+int	ibcs2_ioctl __P((struct proc *, struct ibcs2_ioctl_args *));
+int	ibcs2_uadmin __P((struct proc *, struct ibcs2_uadmin_args *));
+int	ibcs2_utssys __P((struct proc *, struct ibcs2_utssys_args *));
+int	ibcs2_execve __P((struct proc *, struct ibcs2_execve_args *));
+int	ibcs2_fcntl __P((struct proc *, struct ibcs2_fcntl_args *));
+int	ibcs2_ulimit __P((struct proc *, struct ibcs2_ulimit_args *));
+int	ibcs2_rmdir __P((struct proc *, struct ibcs2_rmdir_args *));
+int	ibcs2_mkdir __P((struct proc *, struct ibcs2_mkdir_args *));
+int	ibcs2_getdents __P((struct proc *, struct ibcs2_getdents_args *));
+int	ibcs2_sysfs __P((struct proc *, struct ibcs2_sysfs_args *));
+int	ibcs2_getmsg __P((struct proc *, struct ibcs2_getmsg_args *));
+int	ibcs2_putmsg __P((struct proc *, struct ibcs2_putmsg_args *));
+int	ibcs2_poll __P((struct proc *, struct ibcs2_poll_args *));
+int	ibcs2_secure __P((struct proc *, struct ibcs2_secure_args *));
+int	ibcs2_symlink __P((struct proc *, struct ibcs2_symlink_args *));
+int	ibcs2_lstat __P((struct proc *, struct ibcs2_lstat_args *));
+int	ibcs2_readlink __P((struct proc *, struct ibcs2_readlink_args *));
+int	ibcs2_isc __P((struct proc *, struct ibcs2_isc_args *));
 
 #ifdef COMPAT_43
 
diff --git a/sys/i386/ibcs2/ibcs2_signal.c b/sys/i386/ibcs2/ibcs2_signal.c
index b94a373..432858d 100644
--- a/sys/i386/ibcs2/ibcs2_signal.c
+++ b/sys/i386/ibcs2/ibcs2_signal.c
@@ -25,7 +25,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: ibcs2_signal.c,v 1.10 1997/03/24 11:23:32 bde Exp $
+ * $Id: ibcs2_signal.c,v 1.11 1997/07/20 09:39:46 bde Exp $
  */
 
 #include <sys/param.h>
@@ -186,10 +186,9 @@ bsd_to_ibcs2_sigaction(bsa, isa)
 }
 
 int
-ibcs2_sigaction(p, uap, retval)
+ibcs2_sigaction(p, uap)
 	register struct proc *p;
 	struct ibcs2_sigaction_args *uap;
-	int *retval;
 {
 	struct ibcs2_sigaction *nisa, *oisa, tmpisa;
 	struct sigaction *nbsa, *obsa, tmpbsa;
@@ -220,7 +219,7 @@ ibcs2_sigaction(p, uap, retval)
 	SCARG(&sa, nsa) = nbsa;
 	SCARG(&sa, osa) = obsa;
 
-	if ((error = sigaction(p, &sa, retval)) != 0)
+	if ((error = sigaction(p, &sa)) != 0)
 		return error;
 
 	if (oisa != NULL) {
@@ -235,10 +234,9 @@ ibcs2_sigaction(p, uap, retval)
 }
 
 int
-ibcs2_sigsys(p, uap, retval)
+ibcs2_sigsys(p, uap)
 	register struct proc *p;
 	struct ibcs2_sigsys_args *uap;
-	int *retval;
 {
 	struct sigaction sa;
 	int signum = ibcs2_to_bsd_sig[IBCS2_SIGNO(SCARG(uap, sig))];
@@ -248,7 +246,7 @@ ibcs2_sigsys(p, uap, retval)
 	if (signum <= 0 || signum >= IBCS2_NSIG) {
 		if (IBCS2_SIGCALL(SCARG(uap, sig)) == IBCS2_SIGNAL_MASK ||
 		    IBCS2_SIGCALL(SCARG(uap, sig)) == IBCS2_SIGSET_MASK)
-			*retval = (int)IBCS2_SIG_ERR;
+			p->p_retval[0] = (int)IBCS2_SIG_ERR;
 		return EINVAL;
 	}
 	
@@ -271,7 +269,7 @@ ibcs2_sigsys(p, uap, retval)
 
 			SCARG(&sa, how) = SIG_BLOCK;
 			SCARG(&sa, mask) = sigmask(signum);
-			return sigprocmask(p, &sa, retval);
+			return sigprocmask(p, &sa);
 		}
 		
 	case IBCS2_SIGNAL_MASK:
@@ -301,26 +299,26 @@ ibcs2_sigsys(p, uap, retval)
 			if (signum != SIGALRM)
 				sa.sa_flags |= SA_RESTART;
 #endif
-			*retval = (int)IBCS2_SIG_ERR; /* init error return */
+			p->p_retval[0] = (int)IBCS2_SIG_ERR; /* init error return */
 
 			/* perform native sigaction() */
 			if ((error = copyout(&sa, nbsa, sizeof(sa))) != 0)
 				return error;
-			if ((error = sigaction(p, &sa_args, retval)) != 0) {
+			if ((error = sigaction(p, &sa_args)) != 0) {
 				DPRINTF(("signal: sigaction failed: %d\n",
 					 error));
 				return error;
 			}
 			if ((error = copyin(obsa, &sa, sizeof(sa))) != 0)
 				return error;
-			*retval = (int)sa.sa_handler;
+			p->p_retval[0] = (int)sa.sa_handler;
 
 			/* special sigset() check */
                         if(IBCS2_SIGCALL(SCARG(uap, sig)) == IBCS2_SIGSET_MASK)
 			        /* check to make sure signal is not blocked */
                                 if(sigismember(&p->p_sigmask, signum)) {
 				        /* return SIG_HOLD and unblock signal*/
-                                        *retval = (int)IBCS2_SIG_HOLD;
+                                        p->p_retval[0] = (int)IBCS2_SIG_HOLD;
 					p->p_sigmask &= ~sigmask(signum);
 				}
 				
@@ -333,7 +331,7 @@ ibcs2_sigsys(p, uap, retval)
 
 			SCARG(&sa, how) = SIG_UNBLOCK;
 			SCARG(&sa, mask) = sigmask(signum);
-			return sigprocmask(p, &sa, retval);
+			return sigprocmask(p, &sa);
 		}
 		
 	case IBCS2_SIGIGNORE_MASK:
@@ -351,7 +349,7 @@ ibcs2_sigsys(p, uap, retval)
 			sa.sa_flags = 0;
 			if ((error = copyout(&sa, bsa, sizeof(sa))) != 0)
 				return error;
-			if ((error = sigaction(p, &sa_args, retval)) != 0) {
+			if ((error = sigaction(p, &sa_args)) != 0) {
 				DPRINTF(("sigignore: sigaction failed\n"));
 				return error;
 			}
@@ -363,7 +361,7 @@ ibcs2_sigsys(p, uap, retval)
 			struct sigsuspend_args sa;
 
 			SCARG(&sa, mask) = p->p_sigmask &~ sigmask(signum);
-			return sigsuspend(p, &sa, retval);
+			return sigsuspend(p, &sa);
 		}
 		
 	default:
@@ -372,10 +370,9 @@ ibcs2_sigsys(p, uap, retval)
 }
 
 int
-ibcs2_sigprocmask(p, uap, retval)
+ibcs2_sigprocmask(p, uap)
 	register struct proc *p;
 	struct ibcs2_sigprocmask_args *uap;
-	int *retval;
 {
 	ibcs2_sigset_t iss;
 	sigset_t bss;
@@ -423,10 +420,9 @@ ibcs2_sigprocmask(p, uap, retval)
 }
 
 int
-ibcs2_sigpending(p, uap, retval)
+ibcs2_sigpending(p, uap)
 	register struct proc *p;
 	struct ibcs2_sigpending_args *uap;
-	int *retval;
 {
 	sigset_t bss;
 	ibcs2_sigset_t iss;
@@ -438,10 +434,9 @@ ibcs2_sigpending(p, uap, retval)
 }
 
 int
-ibcs2_sigsuspend(p, uap, retval)
+ibcs2_sigsuspend(p, uap)
 	register struct proc *p;
 	struct ibcs2_sigsuspend_args *uap;
-	int *retval;
 {
 	ibcs2_sigset_t sss;
 	sigset_t bss;
@@ -454,30 +449,28 @@ ibcs2_sigsuspend(p, uap, retval)
 	ibcs2_to_bsd_sigset(&sss, &bss);
 
 	SCARG(&sa, mask) = bss;
-	return sigsuspend(p, &sa, retval);
+	return sigsuspend(p, &sa);
 }
 
 int
-ibcs2_pause(p, uap, retval)
+ibcs2_pause(p, uap)
 	register struct proc *p;
 	struct ibcs2_pause_args *uap;
-	int *retval;
 {
 	struct sigsuspend_args bsa;
 
 	SCARG(&bsa, mask) = p->p_sigmask;
-	return sigsuspend(p, &bsa, retval);
+	return sigsuspend(p, &bsa);
 }
 
 int
-ibcs2_kill(p, uap, retval)
+ibcs2_kill(p, uap)
 	register struct proc *p;
 	struct ibcs2_kill_args *uap;
-	int *retval;
 {
 	struct kill_args ka;
 
 	SCARG(&ka, pid) = SCARG(uap, pid);
 	SCARG(&ka, signum) = ibcs2_to_bsd_sig[SCARG(uap, signo)];
-	return kill(p, &ka, retval);
+	return kill(p, &ka);
 }
diff --git a/sys/i386/ibcs2/ibcs2_socksys.c b/sys/i386/ibcs2/ibcs2_socksys.c
index eade7e0..e52bd2c 100644
--- a/sys/i386/ibcs2/ibcs2_socksys.c
+++ b/sys/i386/ibcs2/ibcs2_socksys.c
@@ -45,19 +45,18 @@ struct setipdomainname_args {
 
 /* Local prototypes */
 static int ibcs2_getipdomainname __P((struct proc *,
-				      struct getipdomainname_args *, int *));
+				      struct getipdomainname_args *));
 static int ibcs2_setipdomainname __P((struct proc *,
-				      struct setipdomainname_args *, int *));
+				      struct setipdomainname_args *));
 
 /*
  * iBCS2 socksys calls.
  */
 
 int
-ibcs2_socksys(p, uap, retval)
+ibcs2_socksys(p, uap)
 	register struct proc *p;
 	register struct ibcs2_socksys_args *uap;
-	int *retval;
 {
 	int error;
 	int realargs[7]; /* 1 for command, 6 for recvfrom */
@@ -78,55 +77,55 @@ ibcs2_socksys(p, uap, retval)
 	passargs = (void *)(realargs + 1);
 	switch (realargs[0]) {
 	case SOCKSYS_ACCEPT:
-		return accept(p, passargs, retval);
+		return accept(p, passargs);
 	case SOCKSYS_BIND:
-		return bind(p, passargs, retval);
+		return bind(p, passargs);
 	case SOCKSYS_CONNECT:
-		return connect(p, passargs, retval);
+		return connect(p, passargs);
 	case SOCKSYS_GETPEERNAME:
-		return getpeername(p, passargs, retval);
+		return getpeername(p, passargs);
 	case SOCKSYS_GETSOCKNAME:
-		return getsockname(p, passargs, retval);
+		return getsockname(p, passargs);
 	case SOCKSYS_GETSOCKOPT:
-		return getsockopt(p, passargs, retval);
+		return getsockopt(p, passargs);
 	case SOCKSYS_LISTEN:
-		return listen(p, passargs, retval);
+		return listen(p, passargs);
 	case SOCKSYS_RECV:
 		realargs[5] = realargs[6] = 0;
 		/* FALLTHROUGH */
 	case SOCKSYS_RECVFROM:
-		return recvfrom(p, passargs, retval);
+		return recvfrom(p, passargs);
 	case SOCKSYS_SEND:
 		realargs[5] = realargs[6] = 0;
 		/* FALLTHROUGH */
 	case SOCKSYS_SENDTO:
-		return sendto(p, passargs, retval);
+		return sendto(p, passargs);
 	case SOCKSYS_SETSOCKOPT:
-		return setsockopt(p, passargs, retval);
+		return setsockopt(p, passargs);
 	case SOCKSYS_SHUTDOWN:
-		return shutdown(p, passargs, retval);
+		return shutdown(p, passargs);
 	case SOCKSYS_SOCKET:
-		return socket(p, passargs, retval);
+		return socket(p, passargs);
 	case SOCKSYS_SELECT:
-		return select(p, passargs, retval);
+		return select(p, passargs);
 	case SOCKSYS_GETIPDOMAIN:
-		return ibcs2_getipdomainname(p, passargs, retval);
+		return ibcs2_getipdomainname(p, passargs);
 	case SOCKSYS_SETIPDOMAIN:
-		return ibcs2_setipdomainname(p, passargs, retval);
+		return ibcs2_setipdomainname(p, passargs);
 	case SOCKSYS_ADJTIME:
-		return adjtime(p, passargs, retval);
+		return adjtime(p, passargs);
 	case SOCKSYS_SETREUID:
-		return setreuid(p, passargs, retval);
+		return setreuid(p, passargs);
 	case SOCKSYS_SETREGID:
-		return setregid(p, passargs, retval);
+		return setregid(p, passargs);
 	case SOCKSYS_GETTIME:
-		return gettimeofday(p, passargs, retval);
+		return gettimeofday(p, passargs);
 	case SOCKSYS_SETTIME:
-		return settimeofday(p, passargs, retval);
+		return settimeofday(p, passargs);
 	case SOCKSYS_GETITIMER:
-		return getitimer(p, passargs, retval);
+		return getitimer(p, passargs);
 	case SOCKSYS_SETITIMER:
-		return setitimer(p, passargs, retval);
+		return setitimer(p, passargs);
 
 	default:
 		printf("socksys unknown %08x %08x %08x %08x %08x %08x %08x\n",
@@ -139,10 +138,9 @@ ibcs2_socksys(p, uap, retval)
 
 /* ARGSUSED */
 static int
-ibcs2_getipdomainname(p, uap, retval)
+ibcs2_getipdomainname(p, uap)
         struct proc *p;
         struct getipdomainname_args *uap;
-        int *retval;
 {
 	char hname[MAXHOSTNAMELEN], *dptr;
 	int len;
@@ -164,10 +162,9 @@ ibcs2_getipdomainname(p, uap, retval)
 
 /* ARGSUSED */
 static int
-ibcs2_setipdomainname(p, uap, retval)
+ibcs2_setipdomainname(p, uap)
         struct proc *p;
         struct setipdomainname_args *uap;
-        int *retval;
 {
 	char hname[MAXHOSTNAMELEN], *ptr;
 	int error, sctl[2], hlen;
diff --git a/sys/i386/ibcs2/ibcs2_socksys.h b/sys/i386/ibcs2/ibcs2_socksys.h
index 3335805..f6b212e 100644
--- a/sys/i386/ibcs2/ibcs2_socksys.h
+++ b/sys/i386/ibcs2/ibcs2_socksys.h
@@ -121,6 +121,6 @@ struct ibcs2_socksys_args {
 	caddr_t argsp;
 };
 
-int ibcs2_socksys __P((struct proc *, struct ibcs2_socksys_args *, int *));
+int ibcs2_socksys __P((struct proc *, struct ibcs2_socksys_args *));
 
 #endif /* !_I386_IBCS2_IBCS2_SOCKSYS_H_ */
diff --git a/sys/i386/ibcs2/ibcs2_stat.c b/sys/i386/ibcs2/ibcs2_stat.c
index 88231ee..febf4d2 100644
--- a/sys/i386/ibcs2/ibcs2_stat.c
+++ b/sys/i386/ibcs2/ibcs2_stat.c
@@ -92,10 +92,9 @@ cvt_statfs(sp, buf, len)
 }	
 
 int
-ibcs2_statfs(p, uap, retval)
+ibcs2_statfs(p, uap)
 	struct proc *p;
 	struct ibcs2_statfs_args *uap;
-	int *retval;
 {
 	register struct mount *mp;
 	register struct statfs *sp;
@@ -117,10 +116,9 @@ ibcs2_statfs(p, uap, retval)
 }
 
 int
-ibcs2_fstatfs(p, uap, retval)
+ibcs2_fstatfs(p, uap)
 	struct proc *p;
 	struct ibcs2_fstatfs_args *uap;
-	int *retval;
 {
 	struct file *fp;
 	struct mount *mp;
@@ -138,10 +136,9 @@ ibcs2_fstatfs(p, uap, retval)
 }
 
 int
-ibcs2_stat(p, uap, retval)
+ibcs2_stat(p, uap)
 	struct proc *p;
 	struct ibcs2_stat_args *uap;
-	int *retval;
 {
 	struct stat st;
 	struct ibcs2_stat ibcs2_st;
@@ -153,7 +150,7 @@ ibcs2_stat(p, uap, retval)
 	SCARG(&cup, path) = SCARG(uap, path);
 	SCARG(&cup, ub) = stackgap_alloc(&sg, sizeof(st));
 
-	if (error = stat(p, &cup, retval))
+	if (error = stat(p, &cup))
 		return error;
 
 	if (error = copyin(SCARG(&cup, ub), &st, sizeof(st)))
@@ -164,10 +161,9 @@ ibcs2_stat(p, uap, retval)
 }
 
 int
-ibcs2_lstat(p, uap, retval)
+ibcs2_lstat(p, uap)
 	struct proc *p;
 	struct ibcs2_lstat_args *uap;
-	int *retval;
 {
 	struct stat st;
 	struct ibcs2_stat ibcs2_st;
@@ -179,7 +175,7 @@ ibcs2_lstat(p, uap, retval)
 	SCARG(&cup, path) = SCARG(uap, path);
 	SCARG(&cup, ub) = stackgap_alloc(&sg, sizeof(st));
 
-	if (error = lstat(p, &cup, retval))
+	if (error = lstat(p, &cup))
 		return error;
 
 	if (error = copyin(SCARG(&cup, ub), &st, sizeof(st)))
@@ -190,10 +186,9 @@ ibcs2_lstat(p, uap, retval)
 }
 
 int
-ibcs2_fstat(p, uap, retval)
+ibcs2_fstat(p, uap)
 	struct proc *p;
 	struct ibcs2_fstat_args *uap;
-	int *retval;
 {
 	struct stat st;
 	struct ibcs2_stat ibcs2_st;
@@ -204,7 +199,7 @@ ibcs2_fstat(p, uap, retval)
 	SCARG(&cup, fd) = SCARG(uap, fd);
 	SCARG(&cup, sb) = stackgap_alloc(&sg, sizeof(st));
 
-	if (error = fstat(p, &cup, retval))
+	if (error = fstat(p, &cup))
 		return error;
 
 	if (error = copyin(SCARG(&cup, sb), &st, sizeof(st)))
@@ -215,10 +210,9 @@ ibcs2_fstat(p, uap, retval)
 }
 
 int
-ibcs2_utssys(p, uap, retval)
+ibcs2_utssys(p, uap)
 	struct proc *p;
 	struct ibcs2_utssys_args *uap;
-	int *retval;
 {
 	switch (SCARG(uap, flag)) {
 	case 0:			/* uname(2) */
diff --git a/sys/i386/ibcs2/ibcs2_sysi86.c b/sys/i386/ibcs2/ibcs2_sysi86.c
index a4baef1..ba9c12f 100644
--- a/sys/i386/ibcs2/ibcs2_sysi86.c
+++ b/sys/i386/ibcs2/ibcs2_sysi86.c
@@ -51,7 +51,7 @@
 extern int hw_float;
 
 int
-ibcs2_sysi86(struct proc *p, struct ibcs2_sysi86_args *args, int *retval)
+ibcs2_sysi86(struct proc *p, struct ibcs2_sysi86_args *args)
 {
 	switch (SCARG(args, cmd)) {
 	case SI86_FPHW: {	/* Floating Point information */
@@ -82,7 +82,7 @@ ibcs2_sysi86(struct proc *p, struct ibcs2_sysi86_args *args, int *retval)
 	}
 
 	case SI86_MEM:	/* size of physical memory */
-		*retval = ctob(physmem);
+		p->p_retval[0] = ctob(physmem);
 		return 0;
 
 	default:
diff --git a/sys/i386/ibcs2/ibcs2_util.h b/sys/i386/ibcs2/ibcs2_util.h
index e335a7e..e616234 100644
--- a/sys/i386/ibcs2/ibcs2_util.h
+++ b/sys/i386/ibcs2/ibcs2_util.h
@@ -92,7 +92,7 @@ int ibcs2_emul_find __P((struct proc *, caddr_t *, const char *, char *,
     ibcs2_emul_find(p, sgp, ibcs2_emul_path, path, &(path), 1)
 
 #ifdef SPX_HACK
-int spx_open __P((struct proc *p, void *uap, int *retval));
+int spx_open __P((struct proc *p, void *uap));
 #endif
 
 #endif /* !_IBCS2_UTIL_H_ */
diff --git a/sys/i386/ibcs2/ibcs2_xenix.c b/sys/i386/ibcs2/ibcs2_xenix.c
index 6476e79..8e93285 100644
--- a/sys/i386/ibcs2/ibcs2_xenix.c
+++ b/sys/i386/ibcs2/ibcs2_xenix.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: ibcs2_xenix.c,v 1.12 1997/06/22 19:04:03 sef Exp $
+ *	$Id: ibcs2_xenix.c,v 1.13 1997/07/20 09:39:50 bde Exp $
  */
 
 #include <sys/param.h>
@@ -52,7 +52,7 @@
 extern struct sysent xenix_sysent[];
 
 int
-ibcs2_xenix(struct proc *p, struct ibcs2_xenix_args *uap, int *retval)
+ibcs2_xenix(struct proc *p, struct ibcs2_xenix_args *uap)
 {
 	struct trapframe *tf = p->p_md.md_regs;
         struct sysent *callp;
@@ -62,16 +62,15 @@ ibcs2_xenix(struct proc *p, struct ibcs2_xenix_args *uap, int *retval)
 	callp = &xenix_sysent[code];
 
 	if(code < IBCS2_XENIX_MAXSYSCALL)
-	  return((*callp->sy_call)(p, (void *)uap, retval));
+	  return((*callp->sy_call)(p, (void *)uap));
 	else
 	  return ENOSYS;
 }
 
 int
-xenix_rdchk(p, uap, retval)
+xenix_rdchk(p, uap)
 	struct proc *p;
 	struct xenix_rdchk_args *uap;
-	int *retval;
 {
 	int error;
 	struct ioctl_args sa;
@@ -81,17 +80,16 @@ xenix_rdchk(p, uap, retval)
 	SCARG(&sa, fd) = SCARG(uap, fd);
 	SCARG(&sa, com) = FIONREAD;
 	SCARG(&sa, data) = stackgap_alloc(&sg, sizeof(int));
-	if (error = ioctl(p, &sa, retval))
+	if (error = ioctl(p, &sa))
 		return error;
-	*retval = (*((int*)SCARG(&sa, data))) ? 1 : 0;
+	p->p_retval[0] = (*((int*)SCARG(&sa, data))) ? 1 : 0;
 	return 0;
 }
 
 int
-xenix_chsize(p, uap, retval)
+xenix_chsize(p, uap)
 	struct proc *p;
 	struct xenix_chsize_args *uap;
-	int *retval;
 {
 	struct ftruncate_args sa;
 
@@ -99,15 +97,14 @@ xenix_chsize(p, uap, retval)
 	SCARG(&sa, fd) = SCARG(uap, fd);
 	SCARG(&sa, pad) = 0;
 	SCARG(&sa, length) = SCARG(uap, size);
-	return ftruncate(p, &sa, retval);
+	return ftruncate(p, &sa);
 }
 
 
 int
-xenix_ftime(p, uap, retval)
+xenix_ftime(p, uap)
 	struct proc *p;
 	struct xenix_ftime_args *uap;
-	int *retval;
 {
 	struct timeval tv;
 	struct ibcs2_timeb {
@@ -129,7 +126,7 @@ xenix_ftime(p, uap, retval)
 }
 
 int
-xenix_nap(struct proc *p, struct xenix_nap_args *uap, int *retval)
+xenix_nap(struct proc *p, struct xenix_nap_args *uap)
 {
 	long period;
 
@@ -142,7 +139,7 @@ xenix_nap(struct proc *p, struct xenix_nap_args *uap, int *retval)
 }
 
 int
-xenix_utsname(struct proc *p, struct xenix_utsname_args *uap, int *retval)
+xenix_utsname(struct proc *p, struct xenix_utsname_args *uap)
 {
 	struct ibcs2_sco_utsname {
 		char sysname[9];
@@ -176,15 +173,15 @@ xenix_utsname(struct proc *p, struct xenix_utsname_args *uap, int *retval)
 }
 
 int
-xenix_scoinfo(struct proc *p, struct xenix_scoinfo_args *uap, int *retval)
+xenix_scoinfo(struct proc *p, struct xenix_scoinfo_args *uap)
 {
   /* scoinfo (not documented) */
-  *retval = 0;
+  p->p_retval[0] = 0;
   return 0;
 }
 
 int     
-xenix_eaccess(struct proc *p, struct xenix_eaccess_args *uap, int *retval)
+xenix_eaccess(struct proc *p, struct xenix_eaccess_args *uap)
 {
 	struct ucred *cred = p->p_ucred;
 	struct vnode *vp;
diff --git a/sys/i386/ibcs2/ibcs2_xenix.h b/sys/i386/ibcs2/ibcs2_xenix.h
index bbf7fc7..df0568e 100644
--- a/sys/i386/ibcs2/ibcs2_xenix.h
+++ b/sys/i386/ibcs2/ibcs2_xenix.h
@@ -72,27 +72,22 @@ struct	ibcs2_rename_args {
 struct	xenix_utsname_args {
 	long addr;
 };
-int	xenix_rdchk __P((struct proc *, struct xenix_rdchk_args *, int []));
-int	xenix_chsize __P((struct proc *, struct xenix_chsize_args *, int []));
-int	xenix_ftime __P((struct proc *, struct xenix_ftime_args *, int []));
-int	xenix_nap __P((struct proc *, struct xenix_nap_args *, int []));
-int	xenix_scoinfo __P((struct proc *, struct xenix_scoinfo_args *, int []));
-int	xenix_eaccess __P((struct proc *, struct xenix_eaccess_args *, int []));
-int	ibcs2_sigaction __P((struct proc *, struct ibcs2_sigaction_args *, int []));
-int	ibcs2_sigprocmask __P((struct proc *, struct ibcs2_sigprocmask_args *, int []));
-int	ibcs2_sigpending __P((struct proc *, struct ibcs2_sigpending_args *, int []));
-int	ibcs2_sigsuspend __P((struct proc *, struct ibcs2_sigsuspend_args *, int []));
-int	ibcs2_getgroups __P((struct proc *, struct ibcs2_getgroups_args *, int []));
-int	ibcs2_setgroups __P((struct proc *, struct ibcs2_setgroups_args *, int []));
-int	ibcs2_sysconf __P((struct proc *, struct ibcs2_sysconf_args *, int []));
-int	ibcs2_pathconf __P((struct proc *, struct ibcs2_pathconf_args *, int []));
-int	ibcs2_fpathconf __P((struct proc *, struct ibcs2_fpathconf_args *, int []));
-int	ibcs2_rename __P((struct proc *, struct ibcs2_rename_args *, int []));
-int	xenix_utsname __P((struct proc *, struct xenix_utsname_args *, int []));
-
-#ifdef COMPAT_43
-
-
-#endif /* COMPAT_43 */
+int	xenix_rdchk __P((struct proc *, struct xenix_rdchk_args *));
+int	xenix_chsize __P((struct proc *, struct xenix_chsize_args *));
+int	xenix_ftime __P((struct proc *, struct xenix_ftime_args *));
+int	xenix_nap __P((struct proc *, struct xenix_nap_args *));
+int	xenix_scoinfo __P((struct proc *, struct xenix_scoinfo_args *));
+int	xenix_eaccess __P((struct proc *, struct xenix_eaccess_args *));
+int	ibcs2_sigaction __P((struct proc *, struct ibcs2_sigaction_args *));
+int	ibcs2_sigprocmask __P((struct proc *, struct ibcs2_sigprocmask_args *));
+int	ibcs2_sigpending __P((struct proc *, struct ibcs2_sigpending_args *));
+int	ibcs2_sigsuspend __P((struct proc *, struct ibcs2_sigsuspend_args *));
+int	ibcs2_getgroups __P((struct proc *, struct ibcs2_getgroups_args *));
+int	ibcs2_setgroups __P((struct proc *, struct ibcs2_setgroups_args *));
+int	ibcs2_sysconf __P((struct proc *, struct ibcs2_sysconf_args *));
+int	ibcs2_pathconf __P((struct proc *, struct ibcs2_pathconf_args *));
+int	ibcs2_fpathconf __P((struct proc *, struct ibcs2_fpathconf_args *));
+int	ibcs2_rename __P((struct proc *, struct ibcs2_rename_args *));
+int	xenix_utsname __P((struct proc *, struct xenix_utsname_args *));
 
 #endif /* !_IBCS2_XENIX_H_ */