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.

10 files changed, 423 insertions, 426 deletions

diff --git a/sys/i386/linux/linux_dummy.c b/sys/i386/linux/linux_dummy.c
index bb935f3..30a0dba 100644
--- a/sys/i386/linux/linux_dummy.c
+++ b/sys/i386/linux/linux_dummy.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: linux_dummy.c,v 1.6 1997/07/20 16:05:53 bde Exp $
+ *  $Id: linux_dummy.c,v 1.7 1997/10/29 08:17:09 kato Exp $
  */
 
 #include <sys/param.h>
@@ -36,140 +36,140 @@
 #include <i386/linux/linux_proto.h>
 
 int
-linux_setup(struct proc *p, struct linux_setup_args *args, int *retval)
+linux_setup(struct proc *p, struct linux_setup_args *args)
 {
     printf("Linux-emul(%d): setup() not supported\n", p->p_pid);
     return ENOSYS;
 }
 
 int
-linux_break(struct proc *p, struct linux_break_args *args, int *retval)
+linux_break(struct proc *p, struct linux_break_args *args)
 {
     printf("Linux-emul(%d): break() not supported\n", p->p_pid);
     return ENOSYS;
 }
 
 int
-linux_stat(struct proc *p, struct linux_stat_args *args, int *retval)
+linux_stat(struct proc *p, struct linux_stat_args *args)
 {
     printf("Linux-emul(%d): stat() not supported\n", p->p_pid);
     return ENOSYS;
 }
 
 int
-linux_fstat(struct proc *p, struct linux_fstat_args *args, int *retval)
+linux_fstat(struct proc *p, struct linux_fstat_args *args)
 {
     printf("Linux-emul(%d): fstat() not supported\n", p->p_pid);
     return ENOSYS;
 }
 
 int
-linux_mount(struct proc *p, struct linux_mount_args *args, int *retval)
+linux_mount(struct proc *p, struct linux_mount_args *args)
 {
     printf("Linux-emul(%d): mount() not supported\n", p->p_pid);
     return ENOSYS;
 }
 
 int
-linux_umount(struct proc *p, struct linux_umount_args *args, int *retval)
+linux_umount(struct proc *p, struct linux_umount_args *args)
 {
     printf("Linux-emul(%d): umount() not supported\n", p->p_pid);
     return ENOSYS;
 }
 
 int
-linux_stime(struct proc *p, struct linux_stime_args *args, int *retval)
+linux_stime(struct proc *p, struct linux_stime_args *args)
 {
     printf("Linux-emul(%d): stime() not supported\n", p->p_pid);
     return ENOSYS;
 }
 
 int
-linux_ptrace(struct proc *p, struct linux_ptrace_args *args, int *retval)
+linux_ptrace(struct proc *p, struct linux_ptrace_args *args)
 {
     printf("Linux-emul(%d): ptrace() not supported\n", p->p_pid);
     return ENOSYS;
 }
 
 int
-linux_stty(struct proc *p, struct linux_stty_args *args, int *retval)
+linux_stty(struct proc *p, struct linux_stty_args *args)
 {
     printf("Linux-emul(%d): stty() not supported\n", p->p_pid);
     return ENOSYS;
 }
 
 int
-linux_gtty(struct proc *p, struct linux_gtty_args *args, int *retval)
+linux_gtty(struct proc *p, struct linux_gtty_args *args)
 {
     printf("Linux-emul(%d): gtty() not supported\n", p->p_pid);
     return ENOSYS;
 }
 
 int
-linux_ftime(struct proc *p, struct linux_ftime_args *args, int *retval)
+linux_ftime(struct proc *p, struct linux_ftime_args *args)
 {
     printf("Linux-emul(%d): ftime() not supported\n", p->p_pid);
     return ENOSYS;
 }
 
 int
-linux_prof(struct proc *p, struct linux_prof_args *args, int *retval)
+linux_prof(struct proc *p, struct linux_prof_args *args)
 {
     printf("Linux-emul(%d): prof() not supported\n", p->p_pid);
     return ENOSYS;
 }
 
 int
-linux_phys(struct proc *p, struct linux_phys_args *args, int *retval)
+linux_phys(struct proc *p, struct linux_phys_args *args)
 {
     printf("Linux-emul(%d): phys() not supported\n", p->p_pid);
     return ENOSYS;
 }
 
 int
-linux_lock(struct proc *p, struct linux_lock_args *args, int *retval)
+linux_lock(struct proc *p, struct linux_lock_args *args)
 {
     printf("Linux-emul(%d): lock() not supported\n", p->p_pid);
     return ENOSYS;
 }
 
 int
-linux_mpx(struct proc *p, struct linux_mpx_args *args, int *retval)
+linux_mpx(struct proc *p, struct linux_mpx_args *args)
 {
     printf("Linux-emul(%d): mpx() not supported\n", p->p_pid);
     return ENOSYS;
 }
 
 int
-linux_ulimit(struct proc *p, struct linux_ulimit_args *args, int *retval)
+linux_ulimit(struct proc *p, struct linux_ulimit_args *args)
 {
     printf("Linux-emul(%d): ulimit() not supported\n", p->p_pid);
     return ENOSYS;
 }
 
 int
-linux_olduname(struct proc *p, struct linux_olduname_args *args, int *retval)
+linux_olduname(struct proc *p, struct linux_olduname_args *args)
 {
     printf("Linux-emul(%d): olduname() not supported\n", p->p_pid);
     return ENOSYS;
 }
 
 int
-linux_ustat(struct proc *p, struct linux_ustat_args *args, int *retval)
+linux_ustat(struct proc *p, struct linux_ustat_args *args)
 {
     printf("Linux-emul(%d): ustat() not supported\n", p->p_pid);
     return ENOSYS;
 }
 
 int
-linux_ioperm(struct proc *p, struct linux_ioperm_args *args, int *retval)
+linux_ioperm(struct proc *p, struct linux_ioperm_args *args)
 {
     printf("Linux-emul(%d): ioperm() not supported\n", p->p_pid);
     return 0; /* EINVAL SOS XXX */
 }
 
 int
-linux_ksyslog(struct proc *p, struct linux_ksyslog_args *args, int *retval)
+linux_ksyslog(struct proc *p, struct linux_ksyslog_args *args)
 {
     printf("Linux-emul(%d): ksyslog(%x) not supported\n",
 	p->p_pid, args->what);
@@ -177,105 +177,105 @@ linux_ksyslog(struct proc *p, struct linux_ksyslog_args *args, int *retval)
 }
 
 int
-linux_vhangup(struct proc *p, struct linux_vhangup_args *args, int *retval)
+linux_vhangup(struct proc *p, struct linux_vhangup_args *args)
 {
     printf("Linux-emul(%d): vhangup() not supported\n", p->p_pid);
     return ENOSYS;
 }
 
 int
-linux_idle(struct proc *p, struct linux_idle_args *args, int *retval)
+linux_idle(struct proc *p, struct linux_idle_args *args)
 {
     printf("Linux-emul(%d): idle() not supported\n", p->p_pid);
     return ENOSYS;
 }
 
 int
-linux_vm86(struct proc *p, struct linux_vm86_args *args, int *retval)
+linux_vm86(struct proc *p, struct linux_vm86_args *args)
 {
     printf("Linux-emul(%d): vm86() not supported\n", p->p_pid);
     return ENOSYS;
 }
 
 int
-linux_swapoff(struct proc *p, struct linux_swapoff_args *args, int *retval)
+linux_swapoff(struct proc *p, struct linux_swapoff_args *args)
 {
     printf("Linux-emul(%d): swapoff() not supported\n", p->p_pid);
     return ENOSYS;
 }
 
 int
-linux_sysinfo(struct proc *p, struct linux_sysinfo_args *args, int *retval)
+linux_sysinfo(struct proc *p, struct linux_sysinfo_args *args)
 {
     printf("Linux-emul(%d): sysinfo() not supported\n", p->p_pid);
     return ENOSYS;
 }
 
 int
-linux_clone(struct proc *p, struct linux_clone_args *args, int *retval)
+linux_clone(struct proc *p, struct linux_clone_args *args)
 {
     printf("Linux-emul(%d): clone() not supported\n", p->p_pid);
     return ENOSYS;
 }
 
 int
-linux_uname(struct proc *p, struct linux_uname_args *args, int *retval)
+linux_uname(struct proc *p, struct linux_uname_args *args)
 {
     printf("Linux-emul(%d): uname() not supported\n", p->p_pid);
     return ENOSYS;
 }
 
 int
-linux_modify_ldt(struct proc *p, struct linux_modify_ldt_args *args, int *retval)
+linux_modify_ldt(struct proc *p, struct linux_modify_ldt_args *args)
 {
     printf("Linux-emul(%d): modify_ldt() not supported\n", p->p_pid);
     return ENOSYS;
 }
 
 int
-linux_adjtimex(struct proc *p, struct linux_adjtimex_args *args, int *retval)
+linux_adjtimex(struct proc *p, struct linux_adjtimex_args *args)
 {
     printf("Linux-emul(%d): adjtimex() not supported\n", p->p_pid);
     return ENOSYS;
 }
 
 int
-linux_create_module(struct proc *p, struct linux_create_module_args *args, int *retval)
+linux_create_module(struct proc *p, struct linux_create_module_args *args)
 {
     printf("Linux-emul(%d): create_module() not supported\n", p->p_pid);
     return ENOSYS;
 }
 
 int
-linux_init_module(struct proc *p, struct linux_init_module_args *args, int *retval)
+linux_init_module(struct proc *p, struct linux_init_module_args *args)
 {
     printf("Linux-emul(%d): init_module() not supported\n", p->p_pid);
     return ENOSYS;
 }
 
 int
-linux_delete_module(struct proc *p, struct linux_delete_module_args *args, int *retval)
+linux_delete_module(struct proc *p, struct linux_delete_module_args *args)
 {
     printf("Linux-emul(%d): delete_module() not supported\n", p->p_pid);
     return ENOSYS;
 }
 
 int
-linux_get_kernel_syms(struct proc *p, struct linux_get_kernel_syms_args *args, int *retval)
+linux_get_kernel_syms(struct proc *p, struct linux_get_kernel_syms_args *args)
 {
     printf("Linux-emul(%d): get_kernel_syms() not supported\n", p->p_pid);
     return ENOSYS;
 }
 
 int
-linux_quotactl(struct proc *p, struct linux_quotactl_args *args, int *retval)
+linux_quotactl(struct proc *p, struct linux_quotactl_args *args)
 {
     printf("Linux-emul(%d): quotactl() not supported\n", p->p_pid);
     return ENOSYS;
 }
 
 int
-linux_bdflush(struct proc *p, struct linux_bdflush_args *args, int *retval)
+linux_bdflush(struct proc *p, struct linux_bdflush_args *args)
 {
     printf("Linux-emul(%d): bdflush() not supported\n", p->p_pid);
     return ENOSYS;
diff --git a/sys/i386/linux/linux_file.c b/sys/i386/linux/linux_file.c
index 3c5984a..0cef996 100644
--- a/sys/i386/linux/linux_file.c
+++ b/sys/i386/linux/linux_file.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: linux_file.c,v 1.13 1997/04/05 14:50:56 dfr Exp $
+ *  $Id: linux_file.c,v 1.14 1997/04/06 10:10:50 dfr Exp $
  */
 
 #include <sys/param.h>
@@ -46,7 +46,7 @@
 #include <i386/linux/linux_util.h>
 
 int
-linux_creat(struct proc *p, struct linux_creat_args *args, int *retval)
+linux_creat(struct proc *p, struct linux_creat_args *args)
 {
     struct open_args /* {
 	char *path;
@@ -65,11 +65,11 @@ linux_creat(struct proc *p, struct linux_creat_args *args, int *retval)
     bsd_open_args.path = args->path;
     bsd_open_args.mode = args->mode;
     bsd_open_args.flags = O_WRONLY | O_CREAT | O_TRUNC;
-    return open(p, &bsd_open_args, retval);
+    return open(p, &bsd_open_args);
 }
 
 int
-linux_open(struct proc *p, struct linux_open_args *args, int *retval)
+linux_open(struct proc *p, struct linux_open_args *args)
 {
     struct open_args /* {
 	char *path;
@@ -118,11 +118,11 @@ linux_open(struct proc *p, struct linux_open_args *args, int *retval)
     bsd_open_args.path = args->path;
     bsd_open_args.mode = args->mode;
 
-    error = open(p, &bsd_open_args, retval);
+    error = open(p, &bsd_open_args);
     if (!error && !(bsd_open_args.flags & O_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]];
 
 	if (fp->f_type == DTYPE_VNODE)
 	    (fp->f_ops->fo_ioctl)(fp, TIOCSCTTY, (caddr_t) 0, p);
@@ -183,7 +183,7 @@ bsd_to_linux_flock(struct flock *bsd_flock, struct linux_flock *linux_flock)
 }
 
 int
-linux_fcntl(struct proc *p, struct linux_fcntl_args *args, int *retval)
+linux_fcntl(struct proc *p, struct linux_fcntl_args *args)
 {
     int error, result;
     struct fcntl_args /* {
@@ -216,26 +216,27 @@ linux_fcntl(struct proc *p, struct linux_fcntl_args *args, int *retval)
     switch (args->cmd) {
     case LINUX_F_DUPFD:
 	fcntl_args.cmd = F_DUPFD;
-	return fcntl(p, &fcntl_args, retval);
+	return fcntl(p, &fcntl_args);
 
     case LINUX_F_GETFD:
 	fcntl_args.cmd = F_GETFD;
-	return fcntl(p, &fcntl_args, retval);
+	return fcntl(p, &fcntl_args);
 
     case LINUX_F_SETFD:
 	fcntl_args.cmd = F_SETFD;
-	return fcntl(p, &fcntl_args, retval);
+	return fcntl(p, &fcntl_args);
 
     case LINUX_F_GETFL:
 	fcntl_args.cmd = F_GETFL;
-	error = fcntl(p, &fcntl_args, &result);
-	*retval = 0;
-	if (result & O_RDONLY) *retval |= LINUX_O_RDONLY;
-	if (result & O_WRONLY) *retval |= LINUX_O_WRONLY;
-	if (result & O_RDWR) *retval |= LINUX_O_RDWR;
-	if (result & O_NDELAY) *retval |= LINUX_O_NONBLOCK;
-	if (result & O_APPEND) *retval |= LINUX_O_APPEND;
-	if (result & O_FSYNC) *retval |= LINUX_O_SYNC;
+	error = fcntl(p, &fcntl_args);
+	result = p->p_retval[0];
+	p->p_retval[0] = 0;
+	if (result & O_RDONLY) p->p_retval[0] |= LINUX_O_RDONLY;
+	if (result & O_WRONLY) p->p_retval[0] |= LINUX_O_WRONLY;
+	if (result & O_RDWR) p->p_retval[0] |= LINUX_O_RDWR;
+	if (result & O_NDELAY) p->p_retval[0] |= LINUX_O_NONBLOCK;
+	if (result & O_APPEND) p->p_retval[0] |= LINUX_O_APPEND;
+	if (result & O_FSYNC) p->p_retval[0] |= LINUX_O_SYNC;
 	return error;
 
     case LINUX_F_SETFL:
@@ -243,7 +244,7 @@ linux_fcntl(struct proc *p, struct linux_fcntl_args *args, int *retval)
 	if (args->arg & LINUX_O_APPEND) fcntl_args.arg |= O_APPEND;
 	if (args->arg & LINUX_O_SYNC) fcntl_args.arg |= O_FSYNC;
 	fcntl_args.cmd = F_SETFL;
-	return fcntl(p, &fcntl_args, retval);
+	return fcntl(p, &fcntl_args);
     
     case LINUX_F_GETLK:
 	if ((error = copyin((caddr_t)args->arg, (caddr_t)&linux_flock,
@@ -252,7 +253,7 @@ linux_fcntl(struct proc *p, struct linux_fcntl_args *args, int *retval)
 	linux_to_bsd_flock(&linux_flock, bsd_flock);
 	fcntl_args.cmd = F_GETLK;
 	fcntl_args.arg = (int)bsd_flock;
-	if (error = fcntl(p, &fcntl_args, retval))
+	if (error = fcntl(p, &fcntl_args))
 	    return error;
 	bsd_to_linux_flock(bsd_flock, &linux_flock);
 	return copyout((caddr_t)&linux_flock, (caddr_t)args->arg,
@@ -265,7 +266,7 @@ linux_fcntl(struct proc *p, struct linux_fcntl_args *args, int *retval)
 	linux_to_bsd_flock(&linux_flock, bsd_flock);
 	fcntl_args.cmd = F_SETLK;
 	fcntl_args.arg = (int)bsd_flock;
-	return fcntl(p, &fcntl_args, retval);
+	return fcntl(p, &fcntl_args);
 
     case LINUX_F_SETLKW:
 	if ((error = copyin((caddr_t)args->arg, (caddr_t)&linux_flock,
@@ -274,7 +275,7 @@ linux_fcntl(struct proc *p, struct linux_fcntl_args *args, int *retval)
 	linux_to_bsd_flock(&linux_flock, bsd_flock);
 	fcntl_args.cmd = F_SETLKW;
 	fcntl_args.arg = (int)bsd_flock;
-	return fcntl(p, &fcntl_args, retval);
+	return fcntl(p, &fcntl_args);
 
     case LINUX_F_SETOWN:
     case LINUX_F_GETOWN:
@@ -290,7 +291,7 @@ linux_fcntl(struct proc *p, struct linux_fcntl_args *args, int *retval)
 	    return EBADF;
 	if (fp->f_type == DTYPE_SOCKET) {
 	    fcntl_args.cmd = args->cmd == LINUX_F_SETOWN ? F_SETOWN : F_GETOWN;
-	    return fcntl(p, &fcntl_args, retval); 
+	    return fcntl(p, &fcntl_args); 
 	}
 	vp = (struct vnode *)fp->f_data;
 	if (vp->v_type != VCHR)
@@ -302,7 +303,7 @@ linux_fcntl(struct proc *p, struct linux_fcntl_args *args, int *retval)
 	if (!d_tty || (!(tp = (*d_tty)(va.va_rdev))))
 	    return EINVAL;
 	if (args->cmd == LINUX_F_GETOWN) {
-	    retval[0] = tp->t_pgrp ? tp->t_pgrp->pg_id : NO_PID;
+	    p->p_retval[0] = tp->t_pgrp ? tp->t_pgrp->pg_id : NO_PID;
 	    return 0;
 	}
 	if ((long)args->arg <= 0) {
@@ -323,7 +324,7 @@ linux_fcntl(struct proc *p, struct linux_fcntl_args *args, int *retval)
 }
 
 int
-linux_lseek(struct proc *p, struct linux_lseek_args *args, int *retval)
+linux_lseek(struct proc *p, struct linux_lseek_args *args)
 {
 
     struct lseek_args /* {
@@ -341,12 +342,12 @@ linux_lseek(struct proc *p, struct linux_lseek_args *args, int *retval)
     tmp_args.fd = args->fdes;
     tmp_args.offset = (off_t)args->off;
     tmp_args.whence = args->whence;
-    error = lseek(p, &tmp_args, retval);
+    error = lseek(p, &tmp_args);
     return error;
 }
 
 int
-linux_llseek(struct proc *p, struct linux_llseek_args *args, int *retval)
+linux_llseek(struct proc *p, struct linux_llseek_args *args)
 {
 	struct lseek_args bsd_args;
 	int error;
@@ -362,13 +363,13 @@ linux_llseek(struct proc *p, struct linux_llseek_args *args, int *retval)
 	bsd_args.offset = off;
 	bsd_args.whence = args->whence;
 
-	if ((error = lseek(p, &bsd_args, retval)))
+	if ((error = lseek(p, &bsd_args)))
 		return error;
 
-	if ((error = copyout(retval, (caddr_t)args->res, sizeof (off_t))))
+	if ((error = copyout(p->p_retval, (caddr_t)args->res, sizeof (off_t))))
 		return error;
 
-	retval[0] = 0;
+	p->p_retval[0] = 0;
 	return 0;
 }
 
@@ -384,18 +385,18 @@ struct linux_dirent {
     ALIGN((((char *)&(de)->dname - (char *)de) + (namlen) + 1))
 
 int
-linux_readdir(struct proc *p, struct linux_readdir_args *args, int *retval)
+linux_readdir(struct proc *p, struct linux_readdir_args *args)
 {
 	struct linux_getdents_args lda;
 
 	lda.fd = args->fd;
 	lda.dent = args->dent;
 	lda.count = 1;
-	return linux_getdents(p, &lda, retval);
+	return linux_getdents(p, &lda);
 }
 
 int
-linux_getdents(struct proc *p, struct linux_getdents_args *args, int *retval)
+linux_getdents(struct proc *p, struct linux_getdents_args *args)
 {
     register struct dirent *bdp;
     struct vnode *vp;
@@ -556,7 +557,7 @@ again:
 	nbytes = resid + linuxreclen;
 
 eof:
-    *retval = nbytes - resid;
+    p->p_retval[0] = nbytes - resid;
 out:
     if (cookies)
 	free(cookies, M_TEMP);
@@ -570,7 +571,7 @@ out:
  */
 
 int
-linux_access(struct proc *p, struct linux_access_args *args, int *retval)
+linux_access(struct proc *p, struct linux_access_args *args)
 {
 	struct access_args bsd;
 	caddr_t sg;
@@ -585,11 +586,11 @@ linux_access(struct proc *p, struct linux_access_args *args, int *retval)
 	bsd.path = args->path;
 	bsd.flags = args->flags;
 
-	return access(p, &bsd, retval);
+	return access(p, &bsd);
 }
 
 int
-linux_unlink(struct proc *p, struct linux_unlink_args *args, int *retval)
+linux_unlink(struct proc *p, struct linux_unlink_args *args)
 {
 	struct unlink_args bsd;
 	caddr_t sg;
@@ -603,11 +604,11 @@ linux_unlink(struct proc *p, struct linux_unlink_args *args, int *retval)
 #endif
 	bsd.path = args->path;
 
-	return unlink(p, &bsd, retval);
+	return unlink(p, &bsd);
 }
 
 int
-linux_chdir(struct proc *p, struct linux_chdir_args *args, int *retval)
+linux_chdir(struct proc *p, struct linux_chdir_args *args)
 {
 	struct chdir_args bsd;
 	caddr_t sg;
@@ -621,11 +622,11 @@ linux_chdir(struct proc *p, struct linux_chdir_args *args, int *retval)
 #endif
 	bsd.path = args->path;
 
-	return chdir(p, &bsd, retval);
+	return chdir(p, &bsd);
 }
 
 int
-linux_chmod(struct proc *p, struct linux_chmod_args *args, int *retval)
+linux_chmod(struct proc *p, struct linux_chmod_args *args)
 {
 	struct chmod_args bsd;
 	caddr_t sg;
@@ -640,11 +641,11 @@ linux_chmod(struct proc *p, struct linux_chmod_args *args, int *retval)
 	bsd.path = args->path;
 	bsd.mode = args->mode;
 
-	return chmod(p, &bsd, retval);
+	return chmod(p, &bsd);
 }
 
 int
-linux_chown(struct proc *p, struct linux_chown_args *args, int *retval)
+linux_chown(struct proc *p, struct linux_chown_args *args)
 {
 	struct chown_args bsd;
 	caddr_t sg;
@@ -661,11 +662,11 @@ linux_chown(struct proc *p, struct linux_chown_args *args, int *retval)
 	bsd.uid = args->uid;
 	bsd.gid = args->gid;
 
-	return chown(p, &bsd, retval);
+	return chown(p, &bsd);
 }
 
 int
-linux_mkdir(struct proc *p, struct linux_mkdir_args *args, int *retval)
+linux_mkdir(struct proc *p, struct linux_mkdir_args *args)
 {
 	struct mkdir_args bsd;
 	caddr_t sg;
@@ -680,11 +681,11 @@ linux_mkdir(struct proc *p, struct linux_mkdir_args *args, int *retval)
 	bsd.path = args->path;
 	bsd.mode = args->mode;
 
-	return mkdir(p, &bsd, retval);
+	return mkdir(p, &bsd);
 }
 
 int
-linux_rmdir(struct proc *p, struct linux_rmdir_args *args, int *retval)
+linux_rmdir(struct proc *p, struct linux_rmdir_args *args)
 {
 	struct rmdir_args bsd;
 	caddr_t sg;
@@ -698,11 +699,11 @@ linux_rmdir(struct proc *p, struct linux_rmdir_args *args, int *retval)
 #endif
 	bsd.path = args->path;
 
-	return rmdir(p, &bsd, retval);
+	return rmdir(p, &bsd);
 }
 
 int
-linux_rename(struct proc *p, struct linux_rename_args *args, int *retval)
+linux_rename(struct proc *p, struct linux_rename_args *args)
 {
 	struct rename_args bsd;
 	caddr_t sg;
@@ -718,11 +719,11 @@ linux_rename(struct proc *p, struct linux_rename_args *args, int *retval)
 	bsd.from = args->from;
 	bsd.to = args->to;
 
-	return rename(p, &bsd, retval);
+	return rename(p, &bsd);
 }
 
 int
-linux_symlink(struct proc *p, struct linux_symlink_args *args, int *retval)
+linux_symlink(struct proc *p, struct linux_symlink_args *args)
 {
 	struct symlink_args bsd;
 	caddr_t sg;
@@ -738,11 +739,11 @@ linux_symlink(struct proc *p, struct linux_symlink_args *args, int *retval)
 	bsd.path = args->path;
 	bsd.link = args->to;
 
-	return symlink(p, &bsd, retval);
+	return symlink(p, &bsd);
 }
 
 int
-linux_execve(struct proc *p, struct linux_execve_args *args, int *retval)
+linux_execve(struct proc *p, struct linux_execve_args *args)
 {
 	struct execve_args bsd;
 	caddr_t sg;
@@ -758,11 +759,11 @@ linux_execve(struct proc *p, struct linux_execve_args *args, int *retval)
 	bsd.argv = args->argp;
 	bsd.envv = args->envp;
 
-	return execve(p, &bsd, retval);
+	return execve(p, &bsd);
 }
 
 int
-linux_readlink(struct proc *p, struct linux_readlink_args *args, int *retval)
+linux_readlink(struct proc *p, struct linux_readlink_args *args)
 {
 	struct readlink_args bsd;
 	caddr_t sg;
@@ -778,11 +779,11 @@ linux_readlink(struct proc *p, struct linux_readlink_args *args, int *retval)
 	bsd.buf = args->buf;
 	bsd.count = args->count;
 
-	return readlink(p, &bsd, retval);
+	return readlink(p, &bsd);
 }
 
 int
-linux_truncate(struct proc *p, struct linux_truncate_args *args, int *retval)
+linux_truncate(struct proc *p, struct linux_truncate_args *args)
 {
 	struct otruncate_args bsd;
 	caddr_t sg;
@@ -796,6 +797,6 @@ linux_truncate(struct proc *p, struct linux_truncate_args *args, int *retval)
 #endif
 	bsd.path = args->path;
 
-	return otruncate(p, &bsd, retval);
+	return otruncate(p, &bsd);
 }
 
diff --git a/sys/i386/linux/linux_ioctl.c b/sys/i386/linux/linux_ioctl.c
index 32fb41b..6993144 100644
--- a/sys/i386/linux/linux_ioctl.c
+++ b/sys/i386/linux/linux_ioctl.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: linux_ioctl.c,v 1.19 1997/06/02 10:43:41 dfr Exp $
+ *  $Id: linux_ioctl.c,v 1.20 1997/07/20 16:05:59 bde Exp $
  */
 
 #include <sys/param.h>
@@ -447,7 +447,7 @@ linux_tiocsserial(struct file *fp, struct linux_serial_struct *lss)
 }
 
 int
-linux_ioctl(struct proc *p, struct linux_ioctl_args *args, int *retval)
+linux_ioctl(struct proc *p, struct linux_ioctl_args *args)
 {
     struct termios bsd_termios;
     struct linux_termios linux_termios;
@@ -513,79 +513,79 @@ linux_ioctl(struct proc *p, struct linux_ioctl_args *args, int *retval)
 	    
     case LINUX_TIOCGPGRP:
 	args->cmd = TIOCGPGRP;
-	return ioctl(p, (struct ioctl_args *)args, retval);
+	return ioctl(p, (struct ioctl_args *)args);
 
     case LINUX_TIOCSPGRP:
 	args->cmd = TIOCSPGRP;
-	return ioctl(p, (struct ioctl_args *)args, retval);
+	return ioctl(p, (struct ioctl_args *)args);
 
     case LINUX_TIOCGWINSZ:
 	args->cmd = TIOCGWINSZ;
-	return ioctl(p, (struct ioctl_args *)args, retval);
+	return ioctl(p, (struct ioctl_args *)args);
 
     case LINUX_TIOCSWINSZ:
 	args->cmd = TIOCSWINSZ;
-	return ioctl(p, (struct ioctl_args *)args, retval);
+	return ioctl(p, (struct ioctl_args *)args);
 
     case LINUX_FIONREAD:
 	args->cmd = FIONREAD;
-	return ioctl(p, (struct ioctl_args *)args, retval);
+	return ioctl(p, (struct ioctl_args *)args);
 
     case LINUX_FIONBIO:
 	args->cmd = FIONBIO;
-	return ioctl(p, (struct ioctl_args *)args, retval);
+	return ioctl(p, (struct ioctl_args *)args);
 
     case LINUX_FIOASYNC:
 	args->cmd = FIOASYNC;
-	return ioctl(p, (struct ioctl_args *)args, retval);
+	return ioctl(p, (struct ioctl_args *)args);
 
     case LINUX_FIONCLEX:
 	args->cmd = FIONCLEX;
-	return ioctl(p, (struct ioctl_args *)args, retval);
+	return ioctl(p, (struct ioctl_args *)args);
 
     case LINUX_FIOCLEX:
 	args->cmd = FIOCLEX;
-	return ioctl(p, (struct ioctl_args *)args, retval);
+	return ioctl(p, (struct ioctl_args *)args);
 
     case LINUX_TIOCEXCL:
 	args->cmd = TIOCEXCL;
-	return ioctl(p, (struct ioctl_args *)args, retval);
+	return ioctl(p, (struct ioctl_args *)args);
 
     case LINUX_TIOCNXCL:
 	args->cmd = TIOCNXCL;
-	return ioctl(p, (struct ioctl_args *)args, retval);
+	return ioctl(p, (struct ioctl_args *)args);
 
     case LINUX_TIOCCONS:
 	args->cmd = TIOCCONS;
-	return ioctl(p, (struct ioctl_args *)args, retval);
+	return ioctl(p, (struct ioctl_args *)args);
 
     case LINUX_TIOCNOTTY:
 	args->cmd = TIOCNOTTY;
-	return ioctl(p, (struct ioctl_args *)args, retval);
+	return ioctl(p, (struct ioctl_args *)args);
 
     case LINUX_SIOCGIFCONF:
 	args->cmd = OSIOCGIFCONF;
-	return ioctl(p, (struct ioctl_args *)args, retval);
+	return ioctl(p, (struct ioctl_args *)args);
 
     case LINUX_SIOCGIFFLAGS:
 	args->cmd = SIOCGIFFLAGS;
-	return ioctl(p, (struct ioctl_args *)args, retval);
+	return ioctl(p, (struct ioctl_args *)args);
 
     case LINUX_SIOCGIFADDR:
 	args->cmd = OSIOCGIFADDR;
-	return ioctl(p, (struct ioctl_args *)args, retval);
+	return ioctl(p, (struct ioctl_args *)args);
 
     case LINUX_SIOCGIFDSTADDR:
 	args->cmd = OSIOCGIFDSTADDR;
-	return ioctl(p, (struct ioctl_args *)args, retval);
+	return ioctl(p, (struct ioctl_args *)args);
 
     case LINUX_SIOCGIFBRDADDR:
 	args->cmd = OSIOCGIFBRDADDR;
-	return ioctl(p, (struct ioctl_args *)args, retval);
+	return ioctl(p, (struct ioctl_args *)args);
 
     case LINUX_SIOCGIFNETMASK:
 	args->cmd = OSIOCGIFNETMASK;
-	return ioctl(p, (struct ioctl_args *)args, retval);
+	return ioctl(p, (struct ioctl_args *)args);
 
 	/* get hardware address */
     case LINUX_SIOCGIFHWADDR:
@@ -621,11 +621,11 @@ linux_ioctl(struct proc *p, struct linux_ioctl_args *args, int *retval)
 
     case LINUX_SIOCADDMULTI:
 	args->cmd = SIOCADDMULTI;
-	return ioctl(p, (struct ioctl_args *)args, retval);
+	return ioctl(p, (struct ioctl_args *)args);
 
     case LINUX_SIOCDELMULTI:
 	args->cmd = SIOCDELMULTI;
-	return ioctl(p, (struct ioctl_args *)args, retval);
+	return ioctl(p, (struct ioctl_args *)args);
 
     case LINUX_TIOCSETD:
 	switch (args->arg) {
@@ -664,136 +664,136 @@ linux_ioctl(struct proc *p, struct linux_ioctl_args *args, int *retval)
 
     case LINUX_SNDCTL_DSP_RESET:
 	args->cmd = SNDCTL_DSP_RESET;
-	return ioctl(p, (struct ioctl_args *)args, retval);
+	return ioctl(p, (struct ioctl_args *)args);
 
     case LINUX_SNDCTL_DSP_SYNC:
 	args->cmd = SNDCTL_DSP_SYNC;
-	return ioctl(p, (struct ioctl_args *)args, retval);
+	return ioctl(p, (struct ioctl_args *)args);
 
     case LINUX_SNDCTL_DSP_SPEED:
 	args->cmd = SNDCTL_DSP_SPEED;
-	return ioctl(p, (struct ioctl_args *)args, retval);
+	return ioctl(p, (struct ioctl_args *)args);
 
     case LINUX_SNDCTL_DSP_STEREO:
 	args->cmd = SNDCTL_DSP_STEREO;
-	return ioctl(p, (struct ioctl_args *)args, retval);
+	return ioctl(p, (struct ioctl_args *)args);
 
     case LINUX_SNDCTL_DSP_GETBLKSIZE:
       /* LINUX_SNDCTL_DSP_SETBLKSIZE */
 	args->cmd = SNDCTL_DSP_GETBLKSIZE;
-	return ioctl(p, (struct ioctl_args *)args, retval);
+	return ioctl(p, (struct ioctl_args *)args);
 
     case LINUX_SNDCTL_DSP_SETFMT:
 	args->cmd = SNDCTL_DSP_SETFMT;
-	return ioctl(p, (struct ioctl_args *)args, retval);
+	return ioctl(p, (struct ioctl_args *)args);
 
     case LINUX_SOUND_PCM_WRITE_CHANNELS:
 	args->cmd = SOUND_PCM_WRITE_CHANNELS;
-	return ioctl(p, (struct ioctl_args *)args, retval);
+	return ioctl(p, (struct ioctl_args *)args);
 
     case LINUX_SOUND_PCM_WRITE_FILTER:
 	args->cmd = SOUND_PCM_WRITE_FILTER;
-	return ioctl(p, (struct ioctl_args *)args, retval);
+	return ioctl(p, (struct ioctl_args *)args);
 
     case LINUX_SNDCTL_DSP_POST:
 	args->cmd = SNDCTL_DSP_POST;
-	return ioctl(p, (struct ioctl_args *)args, retval);
+	return ioctl(p, (struct ioctl_args *)args);
 
     case LINUX_SNDCTL_DSP_SUBDIVIDE:
 	args->cmd = SNDCTL_DSP_SUBDIVIDE;
-	return ioctl(p, (struct ioctl_args *)args, retval);
+	return ioctl(p, (struct ioctl_args *)args);
 
     case LINUX_SNDCTL_DSP_SETFRAGMENT:
 	args->cmd = SNDCTL_DSP_SETFRAGMENT;
-	return ioctl(p, (struct ioctl_args *)args, retval);
+	return ioctl(p, (struct ioctl_args *)args);
 
     case LINUX_SNDCTL_DSP_GETFMTS:
 	args->cmd = SNDCTL_DSP_GETFMTS;
-	return ioctl(p, (struct ioctl_args *)args, retval);
+	return ioctl(p, (struct ioctl_args *)args);
 
     case LINUX_SNDCTL_DSP_GETOSPACE:
 	args->cmd = SNDCTL_DSP_GETOSPACE;
-	return ioctl(p, (struct ioctl_args *)args, retval);
+	return ioctl(p, (struct ioctl_args *)args);
 
     case LINUX_SNDCTL_DSP_GETISPACE:
 	args->cmd = SNDCTL_DSP_GETISPACE;
-	return ioctl(p, (struct ioctl_args *)args, retval);
+	return ioctl(p, (struct ioctl_args *)args);
 
     case LINUX_SNDCTL_DSP_NONBLOCK:
 	args->cmd = SNDCTL_DSP_NONBLOCK;
-	return ioctl(p, (struct ioctl_args *)args, retval);
+	return ioctl(p, (struct ioctl_args *)args);
 
     case LINUX_SOUND_MIXER_WRITE_VOLUME:
 	args->cmd = SOUND_MIXER_WRITE_VOLUME;
-	return ioctl(p, (struct ioctl_args *)args, retval);
+	return ioctl(p, (struct ioctl_args *)args);
 
     case LINUX_SOUND_MIXER_WRITE_BASS:
 	args->cmd = SOUND_MIXER_WRITE_BASS;
-	return ioctl(p, (struct ioctl_args *)args, retval);
+	return ioctl(p, (struct ioctl_args *)args);
 
     case LINUX_SOUND_MIXER_WRITE_TREBLE:
 	args->cmd = SOUND_MIXER_WRITE_TREBLE;
-	return ioctl(p, (struct ioctl_args *)args, retval);
+	return ioctl(p, (struct ioctl_args *)args);
 
     case LINUX_SOUND_MIXER_WRITE_SYNTH:
 	args->cmd = SOUND_MIXER_WRITE_SYNTH;
-	return ioctl(p, (struct ioctl_args *)args, retval);
+	return ioctl(p, (struct ioctl_args *)args);
 
     case LINUX_SOUND_MIXER_WRITE_PCM:
 	args->cmd = SOUND_MIXER_WRITE_PCM;
-	return ioctl(p, (struct ioctl_args *)args, retval);
+	return ioctl(p, (struct ioctl_args *)args);
 
     case LINUX_SOUND_MIXER_WRITE_SPEAKER:
 	args->cmd = SOUND_MIXER_WRITE_SPEAKER;
-	return ioctl(p, (struct ioctl_args *)args, retval);
+	return ioctl(p, (struct ioctl_args *)args);
 
     case LINUX_SOUND_MIXER_WRITE_LINE:
 	args->cmd = SOUND_MIXER_WRITE_LINE;
-	return ioctl(p, (struct ioctl_args *)args, retval);
+	return ioctl(p, (struct ioctl_args *)args);
 
     case LINUX_SOUND_MIXER_WRITE_MIC:
 	args->cmd = SOUND_MIXER_WRITE_MIC;
-	return ioctl(p, (struct ioctl_args *)args, retval);
+	return ioctl(p, (struct ioctl_args *)args);
 
     case LINUX_SOUND_MIXER_WRITE_CD:
 	args->cmd = SOUND_MIXER_WRITE_CD;
-	return ioctl(p, (struct ioctl_args *)args, retval);
+	return ioctl(p, (struct ioctl_args *)args);
 
     case LINUX_SOUND_MIXER_WRITE_IMIX:
 	args->cmd = SOUND_MIXER_WRITE_IMIX;
-	return ioctl(p, (struct ioctl_args *)args, retval);
+	return ioctl(p, (struct ioctl_args *)args);
 
     case LINUX_SOUND_MIXER_WRITE_ALTPCM:
 	args->cmd = SOUND_MIXER_WRITE_ALTPCM;
-	return ioctl(p, (struct ioctl_args *)args, retval);
+	return ioctl(p, (struct ioctl_args *)args);
 
     case LINUX_SOUND_MIXER_WRITE_RECLEV:
 	args->cmd = SOUND_MIXER_WRITE_RECLEV;
-	return ioctl(p, (struct ioctl_args *)args, retval);
+	return ioctl(p, (struct ioctl_args *)args);
 
     case LINUX_SOUND_MIXER_WRITE_IGAIN:
 	args->cmd = SOUND_MIXER_WRITE_IGAIN;
-	return ioctl(p, (struct ioctl_args *)args, retval);
+	return ioctl(p, (struct ioctl_args *)args);
 
     case LINUX_SOUND_MIXER_WRITE_OGAIN:
 	args->cmd = SOUND_MIXER_WRITE_OGAIN;
-	return ioctl(p, (struct ioctl_args *)args, retval);
+	return ioctl(p, (struct ioctl_args *)args);
 
     case LINUX_SOUND_MIXER_WRITE_LINE1:
 	args->cmd = SOUND_MIXER_WRITE_LINE1;
-	return ioctl(p, (struct ioctl_args *)args, retval);
+	return ioctl(p, (struct ioctl_args *)args);
 
     case LINUX_SOUND_MIXER_WRITE_LINE2:
 	args->cmd = SOUND_MIXER_WRITE_LINE2;
-	return ioctl(p, (struct ioctl_args *)args, retval);
+	return ioctl(p, (struct ioctl_args *)args);
 
     case LINUX_SOUND_MIXER_WRITE_LINE3:
 	args->cmd = SOUND_MIXER_WRITE_LINE3;
-	return ioctl(p, (struct ioctl_args *)args, retval);
+	return ioctl(p, (struct ioctl_args *)args);
 
     case LINUX_SOUND_MIXER_READ_DEVMASK:
 	args->cmd = SOUND_MIXER_READ_DEVMASK;
-	return ioctl(p, (struct ioctl_args *)args, retval);
+	return ioctl(p, (struct ioctl_args *)args);
 
     case LINUX_TIOCGSERIAL:
         linux_tiocgserial(fp, (struct linux_serial_struct *)args->arg);
@@ -818,7 +818,7 @@ linux_ioctl(struct proc *p, struct linux_ioctl_args *args, int *retval)
         default:
 	        return EINVAL;
       }
-      return ioctl(p, (struct ioctl_args *)args, retval);
+      return ioctl(p, (struct ioctl_args *)args);
 
     }
     uprintf("LINUX: 'ioctl' fd=%d, typ=0x%x(%c), num=0x%x not implemented\n",
diff --git a/sys/i386/linux/linux_ipc.c b/sys/i386/linux/linux_ipc.c
index ccb2306..2794953 100644
--- a/sys/i386/linux/linux_ipc.c
+++ b/sys/i386/linux/linux_ipc.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: linux_ipc.c,v 1.11 1997/08/10 18:15:20 sos Exp $
+ *  $Id: linux_ipc.c,v 1.12 1997/10/28 10:50:02 kato Exp $
  */
 
 
@@ -40,16 +40,16 @@
 #include <i386/linux/linux_proto.h>
 #include <i386/linux/linux_util.h>
 
-static int linux_semop __P((struct proc *, struct linux_ipc_args *, int *));
-static int linux_semget __P((struct proc *, struct linux_ipc_args *, int *));
-static int linux_semctl __P((struct proc *, struct linux_ipc_args *, int *));
-static int linux_msgsnd __P((struct proc *, struct linux_ipc_args *, int *));
-static int linux_msgrcv __P((struct proc *, struct linux_ipc_args *, int *));
-static int linux_msgctl __P((struct proc *, struct linux_ipc_args *, int *));
-static int linux_shmat __P((struct proc *, struct linux_ipc_args *, int *));
-static int linux_shmdt __P((struct proc *, struct linux_ipc_args *, int *));
-static int linux_shmget __P((struct proc *, struct linux_ipc_args *, int *));
-static int linux_shmctl __P((struct proc *, struct linux_ipc_args *, int *));
+static int linux_semop __P((struct proc *, struct linux_ipc_args *));
+static int linux_semget __P((struct proc *, struct linux_ipc_args *));
+static int linux_semctl __P((struct proc *, struct linux_ipc_args *));
+static int linux_msgsnd __P((struct proc *, struct linux_ipc_args *));
+static int linux_msgrcv __P((struct proc *, struct linux_ipc_args *));
+static int linux_msgctl __P((struct proc *, struct linux_ipc_args *));
+static int linux_shmat __P((struct proc *, struct linux_ipc_args *));
+static int linux_shmdt __P((struct proc *, struct linux_ipc_args *));
+static int linux_shmget __P((struct proc *, struct linux_ipc_args *));
+static int linux_shmctl __P((struct proc *, struct linux_ipc_args *));
 
 struct linux_ipc_perm {
     linux_key_t key;
@@ -160,7 +160,7 @@ bsd_to_linux_shmid_ds(struct shmid_ds *bsp, struct linux_shmid_ds *lsp)
 }
 
 static int
-linux_semop(struct proc *p, struct linux_ipc_args *args, int *retval)
+linux_semop(struct proc *p, struct linux_ipc_args *args)
 {
 	struct semop_args /* {
 	int	semid;
@@ -171,11 +171,11 @@ linux_semop(struct proc *p, struct linux_ipc_args *args, int *retval)
 	bsd_args.semid = args->arg1;
 	bsd_args.sops = (struct sembuf *)args->ptr;
 	bsd_args.nsops = args->arg2;
-	return semop(p, &bsd_args, retval);
+	return semop(p, &bsd_args);
 }
 
 static int
-linux_semget(struct proc *p, struct linux_ipc_args *args, int *retval)
+linux_semget(struct proc *p, struct linux_ipc_args *args)
 {
 	struct semget_args /* {
 	key_t	key;
@@ -186,11 +186,11 @@ linux_semget(struct proc *p, struct linux_ipc_args *args, int *retval)
 	bsd_args.key = args->arg1;
 	bsd_args.nsems = args->arg2;
 	bsd_args.semflg = args->arg3;
-	return semget(p, &bsd_args, retval);
+	return semget(p, &bsd_args);
 }
 
 static int
-linux_semctl(struct proc *p, struct linux_ipc_args *args, int *retval)
+linux_semctl(struct proc *p, struct linux_ipc_args *args)
 {
 	struct linux_semid_ds	linux_semid;
 	struct semid_ds	bsd_semid;
@@ -246,7 +246,7 @@ linux_semctl(struct proc *p, struct linux_ipc_args *args, int *retval)
 		if (error)
 			return error;
 		bsd_args.arg = (union semun *)unptr;
-		return __semctl(p, &bsd_args, retval);
+		return __semctl(p, &bsd_args);
 	case LINUX_IPC_STAT:
 		bsd_args.cmd = IPC_STAT;
 		unptr = stackgap_alloc(&sg, sizeof(union semun *));
@@ -255,7 +255,7 @@ linux_semctl(struct proc *p, struct linux_ipc_args *args, int *retval)
 		if (error)
 			return error;
 		bsd_args.arg = (union semun *)unptr;
-		error = __semctl(p, &bsd_args, retval);
+		error = __semctl(p, &bsd_args);
 		if (error)
 			return error;
 		error = copyin(dsp, (caddr_t)&bsd_semid, sizeof(bsd_semid));
@@ -274,11 +274,11 @@ linux_semctl(struct proc *p, struct linux_ipc_args *args, int *retval)
 		uprintf("LINUX: 'ipc' typ=%d not implemented\n", args->what);
 		return EINVAL;
 	}
-	return __semctl(p, &bsd_args, retval);
+	return __semctl(p, &bsd_args);
 }
 
 static int
-linux_msgsnd(struct proc *p, struct linux_ipc_args *args, int *retval)
+linux_msgsnd(struct proc *p, struct linux_ipc_args *args)
 {
     struct msgsnd_args /* {
 	int     msqid;   
@@ -291,11 +291,11 @@ linux_msgsnd(struct proc *p, struct linux_ipc_args *args, int *retval)
     bsd_args.msgp = args->ptr;
     bsd_args.msgsz = args->arg2;
     bsd_args.msgflg = args->arg3;
-    return msgsnd(p, &bsd_args, retval);
+    return msgsnd(p, &bsd_args);
 }
 
 static int
-linux_msgrcv(struct proc *p, struct linux_ipc_args *args, int *retval)
+linux_msgrcv(struct proc *p, struct linux_ipc_args *args)
 {
     struct msgrcv_args /* {     
         int 	msqid;   
@@ -310,11 +310,11 @@ linux_msgrcv(struct proc *p, struct linux_ipc_args *args, int *retval)
     bsd_args.msgsz = args->arg2;
     bsd_args.msgtyp = 0;
     bsd_args.msgflg = args->arg3;
-    return msgrcv(p, &bsd_args, retval);
+    return msgrcv(p, &bsd_args);
 }
 
 static int
-linux_msgget(struct proc *p, struct linux_ipc_args *args, int *retval)
+linux_msgget(struct proc *p, struct linux_ipc_args *args)
 {
     struct msgget_args /* {
 	key_t	key;
@@ -323,11 +323,11 @@ linux_msgget(struct proc *p, struct linux_ipc_args *args, int *retval)
 
     bsd_args.key = args->arg1;
     bsd_args.msgflg = args->arg2;
-    return msgget(p, &bsd_args, retval);
+    return msgget(p, &bsd_args);
 }
 
 static int
-linux_msgctl(struct proc *p, struct linux_ipc_args *args, int *retval)
+linux_msgctl(struct proc *p, struct linux_ipc_args *args)
 {
     struct msgctl_args /* {
 	int     msqid; 
@@ -338,11 +338,11 @@ linux_msgctl(struct proc *p, struct linux_ipc_args *args, int *retval)
     bsd_args.msqid = args->arg1;
     bsd_args.cmd = args->arg2;
     bsd_args.buf = (struct msqid_ds *)args->ptr;
-    return msgctl(p, &bsd_args, retval);
+    return msgctl(p, &bsd_args);
 }
 
 static int
-linux_shmat(struct proc *p, struct linux_ipc_args *args, int *retval)
+linux_shmat(struct proc *p, struct linux_ipc_args *args)
 {
     struct shmat_args /* {
 	int shmid;
@@ -354,27 +354,27 @@ linux_shmat(struct proc *p, struct linux_ipc_args *args, int *retval)
     bsd_args.shmid = args->arg1;
     bsd_args.shmaddr = args->ptr;
     bsd_args.shmflg = args->arg2;
-    if ((error = shmat(p, &bsd_args, retval)))
+    if ((error = shmat(p, &bsd_args)))
 	return error;
-    if ((error = copyout(retval, (caddr_t)args->arg3, sizeof(int))))
+    if ((error = copyout(p->p_retval, (caddr_t)args->arg3, sizeof(int))))
 	return error;
-    retval[0] = 0;
+    p->p_retval[0] = 0;
     return 0;
 }
 
 static int
-linux_shmdt(struct proc *p, struct linux_ipc_args *args, int *retval)
+linux_shmdt(struct proc *p, struct linux_ipc_args *args)
 {
     struct shmdt_args /* {
 	void *shmaddr;
     } */ bsd_args;
 
     bsd_args.shmaddr = args->ptr;
-    return shmdt(p, &bsd_args, retval);
+    return shmdt(p, &bsd_args);
 }
 
 static int
-linux_shmget(struct proc *p, struct linux_ipc_args *args, int *retval)
+linux_shmget(struct proc *p, struct linux_ipc_args *args)
 {
     struct shmget_args /* {
 	key_t key;
@@ -385,11 +385,11 @@ linux_shmget(struct proc *p, struct linux_ipc_args *args, int *retval)
     bsd_args.key = args->arg1;
     bsd_args.size = args->arg2;
     bsd_args.shmflg = args->arg3;
-    return shmget(p, &bsd_args, retval);
+    return shmget(p, &bsd_args);
 }
 
 static int
-linux_shmctl(struct proc *p, struct linux_ipc_args *args, int *retval)
+linux_shmctl(struct proc *p, struct linux_ipc_args *args)
 {
     struct shmid_ds bsd_shmid;
     struct linux_shmid_ds linux_shmid;
@@ -406,7 +406,7 @@ linux_shmctl(struct proc *p, struct linux_ipc_args *args, int *retval)
 	bsd_args.shmid = args->arg1;
 	bsd_args.cmd = IPC_STAT;
 	bsd_args.buf = (struct shmid_ds*)stackgap_alloc(&sg, sizeof(struct shmid_ds));
-	if ((error = shmctl(p, &bsd_args, retval)))
+	if ((error = shmctl(p, &bsd_args)))
 	    return error;
 	if ((error = copyin((caddr_t)bsd_args.buf, (caddr_t)&bsd_shmid,
 		    	    sizeof(struct shmid_ds))))
@@ -425,7 +425,7 @@ linux_shmctl(struct proc *p, struct linux_ipc_args *args, int *retval)
 	    return error;
 	bsd_args.shmid = args->arg1;
 	bsd_args.cmd = IPC_SET;
-	return shmctl(p, &bsd_args, retval);
+	return shmctl(p, &bsd_args);
 
     case LINUX_IPC_RMID:
 	bsd_args.shmid = args->arg1;
@@ -438,7 +438,7 @@ linux_shmctl(struct proc *p, struct linux_ipc_args *args, int *retval)
 	if ((error = copyout((caddr_t)&bsd_shmid, (caddr_t)bsd_args.buf,
 		     	     sizeof(struct shmid_ds))))
 	    return error;
-	return shmctl(p, &bsd_args, retval);
+	return shmctl(p, &bsd_args);
 
     case LINUX_IPC_INFO:
     case LINUX_SHM_STAT:
@@ -452,31 +452,31 @@ linux_shmctl(struct proc *p, struct linux_ipc_args *args, int *retval)
 }
 
 int
-linux_ipc(struct proc *p, struct linux_ipc_args *args, int *retval)
+linux_ipc(struct proc *p, struct linux_ipc_args *args)
 {
     switch (args->what) {
     case LINUX_SEMOP:
-	return linux_semop(p, args, retval);
+	return linux_semop(p, args);
     case LINUX_SEMGET:
-	return linux_semget(p, args, retval);
+	return linux_semget(p, args);
     case LINUX_SEMCTL:
-	return linux_semctl(p, args, retval);
+	return linux_semctl(p, args);
     case LINUX_MSGSND:
-	return linux_msgsnd(p, args, retval);
+	return linux_msgsnd(p, args);
     case LINUX_MSGRCV:
-	return linux_msgrcv(p, args, retval);
+	return linux_msgrcv(p, args);
     case LINUX_MSGGET:
-	return linux_msgget(p, args, retval);
+	return linux_msgget(p, args);
     case LINUX_MSGCTL:
-	return linux_msgctl(p, args, retval);
+	return linux_msgctl(p, args);
     case LINUX_SHMAT:
-	return linux_shmat(p, args, retval);
+	return linux_shmat(p, args);
     case LINUX_SHMDT:
-	return linux_shmdt(p, args, retval);
+	return linux_shmdt(p, args);
     case LINUX_SHMGET:
-	return linux_shmget(p, args, retval);
+	return linux_shmget(p, args);
     case LINUX_SHMCTL:
-	return linux_shmctl(p, args, retval);
+	return linux_shmctl(p, args);
     default:
 	uprintf("LINUX: 'ipc' typ=%d not implemented\n", args->what);
 	return ENOSYS;
diff --git a/sys/i386/linux/linux_misc.c b/sys/i386/linux/linux_misc.c
index 8b40029..a0da336 100644
--- a/sys/i386/linux/linux_misc.c
+++ b/sys/i386/linux/linux_misc.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: linux_misc.c,v 1.31 1997/10/29 08:17:12 kato Exp $
+ *  $Id: linux_misc.c,v 1.32 1997/10/30 10:53:30 kato Exp $
  */
 
 #include <sys/param.h>
@@ -60,7 +60,7 @@
 #include <i386/linux/linux_util.h>
 
 int
-linux_alarm(struct proc *p, struct linux_alarm_args *args, int *retval)
+linux_alarm(struct proc *p, struct linux_alarm_args *args)
 {
     struct itimerval it, old_it;
     struct timeval tv;
@@ -96,12 +96,12 @@ linux_alarm(struct proc *p, struct linux_alarm_args *args, int *retval)
     splx(s);
     if (old_it.it_value.tv_usec)
 	old_it.it_value.tv_sec++;
-    *retval = old_it.it_value.tv_sec;
+    p->p_retval[0] = old_it.it_value.tv_sec;
     return 0;
 }
 
 int
-linux_brk(struct proc *p, struct linux_brk_args *args, int *retval)
+linux_brk(struct proc *p, struct linux_brk_args *args)
 {
 #if 0
     struct vmspace *vm = p->p_vmspace;
@@ -116,7 +116,7 @@ linux_brk(struct proc *p, struct linux_brk_args *args, int *retval)
 
     old = round_page((vm_offset_t)vm->vm_daddr) + ctob(vm->vm_dsize);
     new = round_page((vm_offset_t)args->dsend);
-    *retval = old;
+    p->p_retval[0] = old;
     if ((new-old) > 0) {
 	if (swap_pager_full)
 	    return ENOMEM;
@@ -125,7 +125,7 @@ linux_brk(struct proc *p, struct linux_brk_args *args, int *retval)
 	if (error)
 	    return error;
 	vm->vm_dsize += btoc((new-old));
-	*retval = (int)(vm->vm_daddr + ctob(vm->vm_dsize));
+	p->p_retval[0] = (int)(vm->vm_daddr + ctob(vm->vm_dsize));
     }
     return 0;
 #else
@@ -141,17 +141,17 @@ linux_brk(struct proc *p, struct linux_brk_args *args, int *retval)
     old = (vm_offset_t)vm->vm_daddr + ctob(vm->vm_dsize);
     new = (vm_offset_t)args->dsend;
     tmp.nsize = (char *) new;
-    if (((caddr_t)new > vm->vm_daddr) && !obreak(p, &tmp, retval))
-	retval[0] = (int)new;
+    if (((caddr_t)new > vm->vm_daddr) && !obreak(p, &tmp))
+	p->p_retval[0] = (int)new;
     else
-	retval[0] = (int)old;
+	p->p_retval[0] = (int)old;
 
     return 0;
 #endif
 }
 
 int
-linux_uselib(struct proc *p, struct linux_uselib_args *args, int *retval)
+linux_uselib(struct proc *p, struct linux_uselib_args *args)
 {
     struct nameidata ni;
     struct vnode *vp;
@@ -408,7 +408,7 @@ struct linux_select_argv {
 };
 
 int
-linux_select(struct proc *p, struct linux_select_args *args, int *retval)
+linux_select(struct proc *p, struct linux_select_args *args)
 {
     struct linux_select_argv linux_args;
     struct linux_newselect_args newsel;
@@ -428,11 +428,11 @@ linux_select(struct proc *p, struct linux_select_args *args, int *retval)
     newsel.exceptfds = linux_args.exceptfds;
     newsel.timeout = linux_args.timeout;
 
-    return linux_newselect(p, &newsel, retval);
+    return linux_newselect(p, &newsel);
 }
 
 int
-linux_newselect(struct proc *p, struct linux_newselect_args *args, int *retval)
+linux_newselect(struct proc *p, struct linux_newselect_args *args)
 {
     struct select_args bsa;
     struct timeval tv0, tv1, utv, *tvp;
@@ -484,7 +484,7 @@ linux_newselect(struct proc *p, struct linux_newselect_args *args, int *retval)
 	microtime(&tv0);
     }
 
-    error = select(p, &bsa, retval);
+    error = select(p, &bsa);
 #ifdef DEBUG
     printf("Linux-emul(%d): real select returns %d\n",
 	       p->p_pid, error);
@@ -501,7 +501,7 @@ linux_newselect(struct proc *p, struct linux_newselect_args *args, int *retval)
     }
 
     if (args->timeout) {
-	if (*retval) {
+	if (p->p_retval[0]) {
 	    /*
 	     * Compute how much time was left of the timeout,
 	     * by subtracting the current time and the time
@@ -532,7 +532,7 @@ select_out:
 }
 
 int
-linux_getpgid(struct proc *p, struct linux_getpgid_args *args, int *retval)
+linux_getpgid(struct proc *p, struct linux_getpgid_args *args)
 {
     struct proc *curproc;
 
@@ -545,22 +545,22 @@ linux_getpgid(struct proc *p, struct linux_getpgid_args *args, int *retval)
     }
     else
 	curproc = p;
-    *retval = curproc->p_pgid;
+    p->p_retval[0] = curproc->p_pgid;
     return 0;
 }
 
 int
-linux_fork(struct proc *p, struct linux_fork_args *args, int *retval)
+linux_fork(struct proc *p, struct linux_fork_args *args)
 {
     int error;
 
 #ifdef DEBUG
     printf("Linux-emul(%d): fork()\n", p->p_pid);
 #endif
-    if (error = fork(p, (struct fork_args *)args, retval))
+    if (error = fork(p, (struct fork_args *)args))
 	return error;
-    if (retval[1] == 1)
-	retval[0] = 0;
+    if (p->p_retval[1] == 1)
+	p->p_retval[0] = 0;
     return 0;
 }
 
@@ -575,7 +575,7 @@ struct linux_mmap_argv {
 };
 
 int
-linux_mmap(struct proc *p, struct linux_mmap_args *args, int *retval)
+linux_mmap(struct proc *p, struct linux_mmap_args *args)
 {
     struct mmap_args /* {
 	caddr_t addr;
@@ -612,11 +612,11 @@ linux_mmap(struct proc *p, struct linux_mmap_args *args, int *retval)
     bsd_args.fd = linux_args.fd;
     bsd_args.pos = linux_args.pos;
     bsd_args.pad = 0;
-    return mmap(p, &bsd_args, retval);
+    return mmap(p, &bsd_args);
 }
 
 int
-linux_msync(struct proc *p, struct linux_msync_args *args, int *retval)
+linux_msync(struct proc *p, struct linux_msync_args *args)
 {
 	struct msync_args bsd_args;
 
@@ -624,27 +624,27 @@ linux_msync(struct proc *p, struct linux_msync_args *args, int *retval)
 	bsd_args.len = args->len;
 	bsd_args.flags = 0;	/* XXX ignore */
 
-	return msync(p, &bsd_args, retval);
+	return msync(p, &bsd_args);
 }
 
 int
-linux_pipe(struct proc *p, struct linux_pipe_args *args, int *retval)
+linux_pipe(struct proc *p, struct linux_pipe_args *args)
 {
     int error;
 
 #ifdef DEBUG
     printf("Linux-emul(%d): pipe(*)\n", p->p_pid);
 #endif
-    if (error = pipe(p, 0, retval))
+    if (error = pipe(p, 0))
 	return error;
-    if (error = copyout(retval, args->pipefds, 2*sizeof(int)))
+    if (error = copyout(p->p_retval, args->pipefds, 2*sizeof(int)))
 	return error;
-    *retval = 0;
+    p->p_retval[0] = 0;
     return 0;
 }
 
 int
-linux_time(struct proc *p, struct linux_time_args *args, int *retval)
+linux_time(struct proc *p, struct linux_time_args *args)
 {
     struct timeval tv;
     linux_time_t tm;
@@ -657,7 +657,7 @@ linux_time(struct proc *p, struct linux_time_args *args, int *retval)
     tm = tv.tv_sec;
     if (args->tm && (error = copyout(&tm, args->tm, sizeof(linux_time_t))))
 	return error;
-    *retval = tm;
+    p->p_retval[0] = tm;
     return 0;
 }
 
@@ -672,7 +672,7 @@ struct linux_times_argv {
 #define CONVTCK(r)	(r.tv_sec * CLK_TCK + r.tv_usec / (1000000 / CLK_TCK))
 
 int
-linux_times(struct proc *p, struct linux_times_args *args, int *retval)
+linux_times(struct proc *p, struct linux_times_args *args)
 {
     struct timeval tv;
     struct linux_times_argv tms;
@@ -696,7 +696,7 @@ linux_times(struct proc *p, struct linux_times_args *args, int *retval)
 
     microtime(&tv);
     timevalsub(&tv, &boottime);
-    *retval = (int)CONVTCK(tv);
+    p->p_retval[0] = (int)CONVTCK(tv);
     return 0;
 }
 
@@ -711,7 +711,7 @@ struct linux_newuname_t {
 };
 
 int
-linux_newuname(struct proc *p, struct linux_newuname_args *args, int *retval)
+linux_newuname(struct proc *p, struct linux_newuname_args *args)
 {
     struct linux_newuname_t linux_newuname;
 
@@ -735,7 +735,7 @@ struct linux_utimbuf {
 };
 
 int
-linux_utime(struct proc *p, struct linux_utime_args *args, int *retval)
+linux_utime(struct proc *p, struct linux_utime_args *args)
 {
     struct utimes_args /* {
 	char	*path;
@@ -768,11 +768,11 @@ linux_utime(struct proc *p, struct linux_utime_args *args, int *retval)
 	bsdutimes.tptr = NULL;
 
     bsdutimes.path = args->fname;
-    return utimes(p, &bsdutimes, retval);
+    return utimes(p, &bsdutimes);
 }
 
 int
-linux_waitpid(struct proc *p, struct linux_waitpid_args *args, int *retval)
+linux_waitpid(struct proc *p, struct linux_waitpid_args *args)
 {
     struct wait_args /* {
 	int pid;
@@ -791,7 +791,7 @@ linux_waitpid(struct proc *p, struct linux_waitpid_args *args, int *retval)
     tmp.options = args->options;
     tmp.rusage = NULL;
 
-    if (error = wait4(p, &tmp, retval))
+    if (error = wait4(p, &tmp))
 	return error;
     if (args->status) {
 	if (error = copyin(args->status, &tmpstat, sizeof(int)))
@@ -808,7 +808,7 @@ linux_waitpid(struct proc *p, struct linux_waitpid_args *args, int *retval)
 }
 
 int
-linux_wait4(struct proc *p, struct linux_wait4_args *args, int *retval)
+linux_wait4(struct proc *p, struct linux_wait4_args *args)
 {
     struct wait_args /* {
 	int pid;
@@ -827,7 +827,7 @@ linux_wait4(struct proc *p, struct linux_wait4_args *args, int *retval)
     tmp.options = args->options;
     tmp.rusage = args->rusage;
 
-    if (error = wait4(p, &tmp, retval))
+    if (error = wait4(p, &tmp))
 	return error;
 
     p->p_siglist &= ~sigmask(SIGCHLD);
@@ -847,7 +847,7 @@ linux_wait4(struct proc *p, struct linux_wait4_args *args, int *retval)
 }
 
 int
-linux_mknod(struct proc *p, struct linux_mknod_args *args, int *retval)
+linux_mknod(struct proc *p, struct linux_mknod_args *args)
 {
 	caddr_t sg;
 	struct mknod_args bsd_mknod;
@@ -865,12 +865,12 @@ linux_mknod(struct proc *p, struct linux_mknod_args *args, int *retval)
 	if (args->mode & S_IFIFO) {
 		bsd_mkfifo.path = args->path;
 		bsd_mkfifo.mode = args->mode;
-		return mkfifo(p, &bsd_mkfifo, retval);
+		return mkfifo(p, &bsd_mkfifo);
 	} else {
 		bsd_mknod.path = args->path;
 		bsd_mknod.mode = args->mode;
 		bsd_mknod.dev = args->dev;
-		return mknod(p, &bsd_mknod, retval);
+		return mknod(p, &bsd_mknod);
 	}
 }
 
@@ -878,8 +878,7 @@ linux_mknod(struct proc *p, struct linux_mknod_args *args, int *retval)
  * UGH! This is just about the dumbest idea I've ever heard!!
  */
 int
-linux_personality(struct proc *p, struct linux_personality_args *args,
-		  int *retval)
+linux_personality(struct proc *p, struct linux_personality_args *args)
 {
 #ifdef DEBUG
 	printf("Linux-emul(%d): personality(%d)\n",
@@ -889,7 +888,7 @@ linux_personality(struct proc *p, struct linux_personality_args *args,
 		return EINVAL;
 
 	/* Yes Jim, it's still a Linux... */
-	retval[0] = 0;
+	p->p_retval[0] = 0;
 	return 0;
 }
 
@@ -897,7 +896,7 @@ linux_personality(struct proc *p, struct linux_personality_args *args,
  * Wrappers for get/setitimer for debugging..
  */
 int
-linux_setitimer(struct proc *p, struct linux_setitimer_args *args, int *retval)
+linux_setitimer(struct proc *p, struct linux_setitimer_args *args)
 {
 	struct setitimer_args bsa;
 	struct itimerval foo;
@@ -919,11 +918,11 @@ linux_setitimer(struct proc *p, struct linux_setitimer_args *args, int *retval)
 	    printf("setitimer: interval: sec: %d, usec: %d\n", foo.it_interval.tv_sec, foo.it_interval.tv_usec);
 #endif
 	}
-	return setitimer(p, &bsa, retval);
+	return setitimer(p, &bsa);
 }
 
 int
-linux_getitimer(struct proc *p, struct linux_getitimer_args *args, int *retval)
+linux_getitimer(struct proc *p, struct linux_getitimer_args *args)
 {
 	struct getitimer_args bsa;
 #ifdef DEBUG
@@ -932,11 +931,11 @@ linux_getitimer(struct proc *p, struct linux_getitimer_args *args, int *retval)
 #endif
 	bsa.which = args->which;
 	bsa.itv = args->itv;
-	return getitimer(p, &bsa, retval);
+	return getitimer(p, &bsa);
 }
 
 int
-linux_iopl(struct proc *p, struct linux_iopl_args *args, int *retval)
+linux_iopl(struct proc *p, struct linux_iopl_args *args)
 {
 	int error;
 
@@ -950,13 +949,13 @@ linux_iopl(struct proc *p, struct linux_iopl_args *args, int *retval)
 }
 
 int
-linux_nice(struct proc *p, struct linux_nice_args *args, int *retval)
+linux_nice(struct proc *p, struct linux_nice_args *args)
 {
 	struct setpriority_args	bsd_args;
 
 	bsd_args.which = PRIO_PROCESS;
 	bsd_args.who = 0;	/* current process */
 	bsd_args.prio = args->inc;
-	return setpriority(p, &bsd_args, retval);
+	return setpriority(p, &bsd_args);
 }
 
diff --git a/sys/i386/linux/linux_proto.h b/sys/i386/linux/linux_proto.h
index 52a13b0..4d2fb37 100644
--- a/sys/i386/linux/linux_proto.h
+++ b/sys/i386/linux/linux_proto.h
@@ -362,100 +362,100 @@ struct	linux_msync_args {
 	int len;
 	int fl;
 };
-int	linux_setup __P((struct proc *, struct linux_setup_args *, int []));
-int	linux_fork __P((struct proc *, struct linux_fork_args *, int []));
-int	linux_open __P((struct proc *, struct linux_open_args *, int []));
-int	linux_waitpid __P((struct proc *, struct linux_waitpid_args *, int []));
-int	linux_creat __P((struct proc *, struct linux_creat_args *, int []));
-int	linux_unlink __P((struct proc *, struct linux_unlink_args *, int []));
-int	linux_execve __P((struct proc *, struct linux_execve_args *, int []));
-int	linux_chdir __P((struct proc *, struct linux_chdir_args *, int []));
-int	linux_time __P((struct proc *, struct linux_time_args *, int []));
-int	linux_mknod __P((struct proc *, struct linux_mknod_args *, int []));
-int	linux_chmod __P((struct proc *, struct linux_chmod_args *, int []));
-int	linux_chown __P((struct proc *, struct linux_chown_args *, int []));
-int	linux_break __P((struct proc *, struct linux_break_args *, int []));
-int	linux_stat __P((struct proc *, struct linux_stat_args *, int []));
-int	linux_lseek __P((struct proc *, struct linux_lseek_args *, int []));
-int	linux_mount __P((struct proc *, struct linux_mount_args *, int []));
-int	linux_umount __P((struct proc *, struct linux_umount_args *, int []));
-int	linux_stime __P((struct proc *, struct linux_stime_args *, int []));
-int	linux_ptrace __P((struct proc *, struct linux_ptrace_args *, int []));
-int	linux_alarm __P((struct proc *, struct linux_alarm_args *, int []));
-int	linux_fstat __P((struct proc *, struct linux_fstat_args *, int []));
-int	linux_pause __P((struct proc *, struct linux_pause_args *, int []));
-int	linux_utime __P((struct proc *, struct linux_utime_args *, int []));
-int	linux_stty __P((struct proc *, struct linux_stty_args *, int []));
-int	linux_gtty __P((struct proc *, struct linux_gtty_args *, int []));
-int	linux_access __P((struct proc *, struct linux_access_args *, int []));
-int	linux_nice __P((struct proc *, struct linux_nice_args *, int []));
-int	linux_ftime __P((struct proc *, struct linux_ftime_args *, int []));
-int	linux_kill __P((struct proc *, struct linux_kill_args *, int []));
-int	linux_rename __P((struct proc *, struct linux_rename_args *, int []));
-int	linux_mkdir __P((struct proc *, struct linux_mkdir_args *, int []));
-int	linux_rmdir __P((struct proc *, struct linux_rmdir_args *, int []));
-int	linux_pipe __P((struct proc *, struct linux_pipe_args *, int []));
-int	linux_times __P((struct proc *, struct linux_times_args *, int []));
-int	linux_prof __P((struct proc *, struct linux_prof_args *, int []));
-int	linux_brk __P((struct proc *, struct linux_brk_args *, int []));
-int	linux_signal __P((struct proc *, struct linux_signal_args *, int []));
-int	linux_phys __P((struct proc *, struct linux_phys_args *, int []));
-int	linux_lock __P((struct proc *, struct linux_lock_args *, int []));
-int	linux_ioctl __P((struct proc *, struct linux_ioctl_args *, int []));
-int	linux_fcntl __P((struct proc *, struct linux_fcntl_args *, int []));
-int	linux_mpx __P((struct proc *, struct linux_mpx_args *, int []));
-int	linux_ulimit __P((struct proc *, struct linux_ulimit_args *, int []));
-int	linux_olduname __P((struct proc *, struct linux_olduname_args *, int []));
-int	linux_ustat __P((struct proc *, struct linux_ustat_args *, int []));
-int	linux_sigaction __P((struct proc *, struct linux_sigaction_args *, int []));
-int	linux_siggetmask __P((struct proc *, struct linux_siggetmask_args *, int []));
-int	linux_sigsetmask __P((struct proc *, struct linux_sigsetmask_args *, int []));
-int	linux_sigsuspend __P((struct proc *, struct linux_sigsuspend_args *, int []));
-int	linux_sigpending __P((struct proc *, struct linux_sigpending_args *, int []));
-int	linux_select __P((struct proc *, struct linux_select_args *, int []));
-int	linux_symlink __P((struct proc *, struct linux_symlink_args *, int []));
-int	linux_readlink __P((struct proc *, struct linux_readlink_args *, int []));
-int	linux_uselib __P((struct proc *, struct linux_uselib_args *, int []));
-int	linux_readdir __P((struct proc *, struct linux_readdir_args *, int []));
-int	linux_mmap __P((struct proc *, struct linux_mmap_args *, int []));
-int	linux_truncate __P((struct proc *, struct linux_truncate_args *, int []));
-int	linux_statfs __P((struct proc *, struct linux_statfs_args *, int []));
-int	linux_fstatfs __P((struct proc *, struct linux_fstatfs_args *, int []));
-int	linux_ioperm __P((struct proc *, struct linux_ioperm_args *, int []));
-int	linux_socketcall __P((struct proc *, struct linux_socketcall_args *, int []));
-int	linux_ksyslog __P((struct proc *, struct linux_ksyslog_args *, int []));
-int	linux_setitimer __P((struct proc *, struct linux_setitimer_args *, int []));
-int	linux_getitimer __P((struct proc *, struct linux_getitimer_args *, int []));
-int	linux_newstat __P((struct proc *, struct linux_newstat_args *, int []));
-int	linux_newlstat __P((struct proc *, struct linux_newlstat_args *, int []));
-int	linux_newfstat __P((struct proc *, struct linux_newfstat_args *, int []));
-int	linux_uname __P((struct proc *, struct linux_uname_args *, int []));
-int	linux_iopl __P((struct proc *, struct linux_iopl_args *, int []));
-int	linux_vhangup __P((struct proc *, struct linux_vhangup_args *, int []));
-int	linux_idle __P((struct proc *, struct linux_idle_args *, int []));
-int	linux_vm86 __P((struct proc *, struct linux_vm86_args *, int []));
-int	linux_wait4 __P((struct proc *, struct linux_wait4_args *, int []));
-int	linux_swapoff __P((struct proc *, struct linux_swapoff_args *, int []));
-int	linux_sysinfo __P((struct proc *, struct linux_sysinfo_args *, int []));
-int	linux_ipc __P((struct proc *, struct linux_ipc_args *, int []));
-int	linux_sigreturn __P((struct proc *, struct linux_sigreturn_args *, int []));
-int	linux_clone __P((struct proc *, struct linux_clone_args *, int []));
-int	linux_newuname __P((struct proc *, struct linux_newuname_args *, int []));
-int	linux_modify_ldt __P((struct proc *, struct linux_modify_ldt_args *, int []));
-int	linux_adjtimex __P((struct proc *, struct linux_adjtimex_args *, int []));
-int	linux_sigprocmask __P((struct proc *, struct linux_sigprocmask_args *, int []));
-int	linux_create_module __P((struct proc *, struct linux_create_module_args *, int []));
-int	linux_init_module __P((struct proc *, struct linux_init_module_args *, int []));
-int	linux_delete_module __P((struct proc *, struct linux_delete_module_args *, int []));
-int	linux_get_kernel_syms __P((struct proc *, struct linux_get_kernel_syms_args *, int []));
-int	linux_quotactl __P((struct proc *, struct linux_quotactl_args *, int []));
-int	linux_getpgid __P((struct proc *, struct linux_getpgid_args *, int []));
-int	linux_bdflush __P((struct proc *, struct linux_bdflush_args *, int []));
-int	linux_personality __P((struct proc *, struct linux_personality_args *, int []));
-int	linux_llseek __P((struct proc *, struct linux_llseek_args *, int []));
-int	linux_getdents __P((struct proc *, struct linux_getdents_args *, int []));
-int	linux_newselect __P((struct proc *, struct linux_newselect_args *, int []));
-int	linux_msync __P((struct proc *, struct linux_msync_args *, int []));
+int	linux_setup __P((struct proc *, struct linux_setup_args *));
+int	linux_fork __P((struct proc *, struct linux_fork_args *));
+int	linux_open __P((struct proc *, struct linux_open_args *));
+int	linux_waitpid __P((struct proc *, struct linux_waitpid_args *));
+int	linux_creat __P((struct proc *, struct linux_creat_args *));
+int	linux_unlink __P((struct proc *, struct linux_unlink_args *));
+int	linux_execve __P((struct proc *, struct linux_execve_args *));
+int	linux_chdir __P((struct proc *, struct linux_chdir_args *));
+int	linux_time __P((struct proc *, struct linux_time_args *));
+int	linux_mknod __P((struct proc *, struct linux_mknod_args *));
+int	linux_chmod __P((struct proc *, struct linux_chmod_args *));
+int	linux_chown __P((struct proc *, struct linux_chown_args *));
+int	linux_break __P((struct proc *, struct linux_break_args *));
+int	linux_stat __P((struct proc *, struct linux_stat_args *));
+int	linux_lseek __P((struct proc *, struct linux_lseek_args *));
+int	linux_mount __P((struct proc *, struct linux_mount_args *));
+int	linux_umount __P((struct proc *, struct linux_umount_args *));
+int	linux_stime __P((struct proc *, struct linux_stime_args *));
+int	linux_ptrace __P((struct proc *, struct linux_ptrace_args *));
+int	linux_alarm __P((struct proc *, struct linux_alarm_args *));
+int	linux_fstat __P((struct proc *, struct linux_fstat_args *));
+int	linux_pause __P((struct proc *, struct linux_pause_args *));
+int	linux_utime __P((struct proc *, struct linux_utime_args *));
+int	linux_stty __P((struct proc *, struct linux_stty_args *));
+int	linux_gtty __P((struct proc *, struct linux_gtty_args *));
+int	linux_access __P((struct proc *, struct linux_access_args *));
+int	linux_nice __P((struct proc *, struct linux_nice_args *));
+int	linux_ftime __P((struct proc *, struct linux_ftime_args *));
+int	linux_kill __P((struct proc *, struct linux_kill_args *));
+int	linux_rename __P((struct proc *, struct linux_rename_args *));
+int	linux_mkdir __P((struct proc *, struct linux_mkdir_args *));
+int	linux_rmdir __P((struct proc *, struct linux_rmdir_args *));
+int	linux_pipe __P((struct proc *, struct linux_pipe_args *));
+int	linux_times __P((struct proc *, struct linux_times_args *));
+int	linux_prof __P((struct proc *, struct linux_prof_args *));
+int	linux_brk __P((struct proc *, struct linux_brk_args *));
+int	linux_signal __P((struct proc *, struct linux_signal_args *));
+int	linux_phys __P((struct proc *, struct linux_phys_args *));
+int	linux_lock __P((struct proc *, struct linux_lock_args *));
+int	linux_ioctl __P((struct proc *, struct linux_ioctl_args *));
+int	linux_fcntl __P((struct proc *, struct linux_fcntl_args *));
+int	linux_mpx __P((struct proc *, struct linux_mpx_args *));
+int	linux_ulimit __P((struct proc *, struct linux_ulimit_args *));
+int	linux_olduname __P((struct proc *, struct linux_olduname_args *));
+int	linux_ustat __P((struct proc *, struct linux_ustat_args *));
+int	linux_sigaction __P((struct proc *, struct linux_sigaction_args *));
+int	linux_siggetmask __P((struct proc *, struct linux_siggetmask_args *));
+int	linux_sigsetmask __P((struct proc *, struct linux_sigsetmask_args *));
+int	linux_sigsuspend __P((struct proc *, struct linux_sigsuspend_args *));
+int	linux_sigpending __P((struct proc *, struct linux_sigpending_args *));
+int	linux_select __P((struct proc *, struct linux_select_args *));
+int	linux_symlink __P((struct proc *, struct linux_symlink_args *));
+int	linux_readlink __P((struct proc *, struct linux_readlink_args *));
+int	linux_uselib __P((struct proc *, struct linux_uselib_args *));
+int	linux_readdir __P((struct proc *, struct linux_readdir_args *));
+int	linux_mmap __P((struct proc *, struct linux_mmap_args *));
+int	linux_truncate __P((struct proc *, struct linux_truncate_args *));
+int	linux_statfs __P((struct proc *, struct linux_statfs_args *));
+int	linux_fstatfs __P((struct proc *, struct linux_fstatfs_args *));
+int	linux_ioperm __P((struct proc *, struct linux_ioperm_args *));
+int	linux_socketcall __P((struct proc *, struct linux_socketcall_args *));
+int	linux_ksyslog __P((struct proc *, struct linux_ksyslog_args *));
+int	linux_setitimer __P((struct proc *, struct linux_setitimer_args *));
+int	linux_getitimer __P((struct proc *, struct linux_getitimer_args *));
+int	linux_newstat __P((struct proc *, struct linux_newstat_args *));
+int	linux_newlstat __P((struct proc *, struct linux_newlstat_args *));
+int	linux_newfstat __P((struct proc *, struct linux_newfstat_args *));
+int	linux_uname __P((struct proc *, struct linux_uname_args *));
+int	linux_iopl __P((struct proc *, struct linux_iopl_args *));
+int	linux_vhangup __P((struct proc *, struct linux_vhangup_args *));
+int	linux_idle __P((struct proc *, struct linux_idle_args *));
+int	linux_vm86 __P((struct proc *, struct linux_vm86_args *));
+int	linux_wait4 __P((struct proc *, struct linux_wait4_args *));
+int	linux_swapoff __P((struct proc *, struct linux_swapoff_args *));
+int	linux_sysinfo __P((struct proc *, struct linux_sysinfo_args *));
+int	linux_ipc __P((struct proc *, struct linux_ipc_args *));
+int	linux_sigreturn __P((struct proc *, struct linux_sigreturn_args *));
+int	linux_clone __P((struct proc *, struct linux_clone_args *));
+int	linux_newuname __P((struct proc *, struct linux_newuname_args *));
+int	linux_modify_ldt __P((struct proc *, struct linux_modify_ldt_args *));
+int	linux_adjtimex __P((struct proc *, struct linux_adjtimex_args *));
+int	linux_sigprocmask __P((struct proc *, struct linux_sigprocmask_args *));
+int	linux_create_module __P((struct proc *, struct linux_create_module_args *));
+int	linux_init_module __P((struct proc *, struct linux_init_module_args *));
+int	linux_delete_module __P((struct proc *, struct linux_delete_module_args *));
+int	linux_get_kernel_syms __P((struct proc *, struct linux_get_kernel_syms_args *));
+int	linux_quotactl __P((struct proc *, struct linux_quotactl_args *));
+int	linux_getpgid __P((struct proc *, struct linux_getpgid_args *));
+int	linux_bdflush __P((struct proc *, struct linux_bdflush_args *));
+int	linux_personality __P((struct proc *, struct linux_personality_args *));
+int	linux_llseek __P((struct proc *, struct linux_llseek_args *));
+int	linux_getdents __P((struct proc *, struct linux_getdents_args *));
+int	linux_newselect __P((struct proc *, struct linux_newselect_args *));
+int	linux_msync __P((struct proc *, struct linux_msync_args *));
 
 #ifdef COMPAT_43
 
diff --git a/sys/i386/linux/linux_signal.c b/sys/i386/linux/linux_signal.c
index ec8f5bd..a85bf65 100644
--- a/sys/i386/linux/linux_signal.c
+++ b/sys/i386/linux/linux_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: linux_signal.c,v 1.8 1997/02/22 09:38:24 peter Exp $
+ *  $Id: linux_signal.c,v 1.9 1997/07/20 16:06:03 bde Exp $
  */
 
 #include <sys/param.h>
@@ -104,7 +104,7 @@ bsd_to_linux_sigaction(struct sigaction *bsa, linux_sigaction_t *lsa)
 }
 
 int
-linux_sigaction(struct proc *p, struct linux_sigaction_args *args, int *retval)
+linux_sigaction(struct proc *p, struct linux_sigaction_args *args)
 {
     linux_sigaction_t linux_sa;
     struct sigaction *nsa = NULL, *osa = NULL, bsd_sa;
@@ -131,7 +131,7 @@ linux_sigaction(struct proc *p, struct linux_sigaction_args *args, int *retval)
     sa.signum = linux_to_bsd_signal[args->sig];
     sa.nsa = nsa;
     sa.osa = osa;
-    if ((error = sigaction(p, &sa, retval)))
+    if ((error = sigaction(p, &sa)))
 	return error;
 
     if (args->osa) {
@@ -145,7 +145,7 @@ linux_sigaction(struct proc *p, struct linux_sigaction_args *args, int *retval)
 }
 
 int
-linux_signal(struct proc *p, struct linux_signal_args *args, int *retval)
+linux_signal(struct proc *p, struct linux_signal_args *args)
 {
     caddr_t sg;
     struct sigaction_args sa_args;
@@ -169,21 +169,20 @@ linux_signal(struct proc *p, struct linux_signal_args *args, int *retval)
     sa_args.signum = linux_to_bsd_signal[args->sig];
     sa_args.osa = osa;
     sa_args.nsa = nsa;
-    if ((error = sigaction(p, &sa_args, retval)))
+    if ((error = sigaction(p, &sa_args)))
 	return error;
 
     if ((error = copyin(osa, &tmpsa, sizeof *osa)))
 	return error;
 
-    *retval = (int)tmpsa.sa_handler;
+    p->p_retval[0] = (int)tmpsa.sa_handler;
 
     return 0;
 }
 
 
 int
-linux_sigprocmask(struct proc *p, struct linux_sigprocmask_args *args,
-		  int *retval)
+linux_sigprocmask(struct proc *p, struct linux_sigprocmask_args *args)
 {
     int error, s;
     sigset_t mask;
@@ -193,7 +192,7 @@ linux_sigprocmask(struct proc *p, struct linux_sigprocmask_args *args,
     printf("Linux-emul(%d): sigprocmask(%d, *, *)\n", p->p_pid, args->how);
 #endif
 
-    *retval = 0;
+    p->p_retval[0] = 0;
 
     if (args->omask != NULL) {
 	omask = bsd_to_linux_sigset(p->p_sigmask);
@@ -226,17 +225,17 @@ linux_sigprocmask(struct proc *p, struct linux_sigprocmask_args *args,
 }
 
 int
-linux_siggetmask(struct proc *p, struct linux_siggetmask_args *args, int *retval)
+linux_siggetmask(struct proc *p, struct linux_siggetmask_args *args)
 {
 #ifdef DEBUG
     printf("Linux-emul(%d): siggetmask()\n", p->p_pid);
 #endif
-    *retval = bsd_to_linux_sigset(p->p_sigmask);
+    p->p_retval[0] = bsd_to_linux_sigset(p->p_sigmask);
     return 0;
 }
 
 int
-linux_sigsetmask(struct proc *p, struct linux_sigsetmask_args *args,int *retval)
+linux_sigsetmask(struct proc *p, struct linux_sigsetmask_args *args)
 {
     int s;
     sigset_t mask;
@@ -244,7 +243,7 @@ linux_sigsetmask(struct proc *p, struct linux_sigsetmask_args *args,int *retval)
 #ifdef DEBUG
     printf("Linux-emul(%d): sigsetmask(%08x)\n", p->p_pid, args->mask);
 #endif
-    *retval = bsd_to_linux_sigset(p->p_sigmask);
+    p->p_retval[0] = bsd_to_linux_sigset(p->p_sigmask);
 
     mask = linux_to_bsd_sigset(args->mask);
     s = splhigh();
@@ -254,7 +253,7 @@ linux_sigsetmask(struct proc *p, struct linux_sigsetmask_args *args,int *retval)
 }
 
 int
-linux_sigpending(struct proc *p, struct linux_sigpending_args *args,int *retval)
+linux_sigpending(struct proc *p, struct linux_sigpending_args *args)
 {
     linux_sigset_t linux_sig;
 
@@ -271,7 +270,7 @@ linux_sigpending(struct proc *p, struct linux_sigpending_args *args,int *retval)
  * enables the signal to happen with a different register set.
  */
 int
-linux_sigsuspend(struct proc *p, struct linux_sigsuspend_args *args,int *retval)
+linux_sigsuspend(struct proc *p, struct linux_sigsuspend_args *args)
 {
     struct sigsuspend_args tmp;
 
@@ -279,11 +278,11 @@ linux_sigsuspend(struct proc *p, struct linux_sigsuspend_args *args,int *retval)
     printf("Linux-emul(%d): sigsuspend(%08x)\n", p->p_pid, args->mask);
 #endif
     tmp.mask = linux_to_bsd_sigset(args->mask);
-    return sigsuspend(p, &tmp , retval);
+    return sigsuspend(p, &tmp);
 }
 
 int
-linux_pause(struct proc *p, struct linux_pause_args *args,int *retval)
+linux_pause(struct proc *p, struct linux_pause_args *args)
 {
     struct sigsuspend_args tmp;
 
@@ -291,11 +290,11 @@ linux_pause(struct proc *p, struct linux_pause_args *args,int *retval)
     printf("Linux-emul(%d): pause()\n", p->p_pid);
 #endif
     tmp.mask = p->p_sigmask;
-    return sigsuspend(p, &tmp , retval);
+    return sigsuspend(p, &tmp);
 }
 
 int
-linux_kill(struct proc *p, struct linux_kill_args *args, int *retval)
+linux_kill(struct proc *p, struct linux_kill_args *args)
 {
     struct kill_args /* {
 	int pid;
@@ -308,5 +307,5 @@ linux_kill(struct proc *p, struct linux_kill_args *args, int *retval)
 #endif
     tmp.pid = args->pid;
     tmp.signum = linux_to_bsd_signal[args->signum];
-    return kill(p, &tmp, retval);
+    return kill(p, &tmp);
 }
diff --git a/sys/i386/linux/linux_socket.c b/sys/i386/linux/linux_socket.c
index 10d39d8..417aade 100644
--- a/sys/i386/linux/linux_socket.c
+++ b/sys/i386/linux/linux_socket.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: linux_socket.c,v 1.7 1997/02/22 09:38:25 peter Exp $
+ *  $Id: linux_socket.c,v 1.8 1997/07/20 16:06:04 bde Exp $
  */
 
 /* XXX we use functions that might not exist. */
@@ -138,7 +138,7 @@ struct linux_socket_args {
 };
 
 static int
-linux_socket(struct proc *p, struct linux_socket_args *args, int *retval)
+linux_socket(struct proc *p, struct linux_socket_args *args)
 {
     struct linux_socket_args linux_args;
     struct socket_args /* {
@@ -155,7 +155,7 @@ linux_socket(struct proc *p, struct linux_socket_args *args, int *retval)
     bsd_args.domain = linux_to_bsd_domain(linux_args.domain);
     if (bsd_args.domain == -1)
 	return EINVAL;
-    return socket(p, &bsd_args, retval);
+    return socket(p, &bsd_args);
 }
 
 struct linux_bind_args {
@@ -165,7 +165,7 @@ struct linux_bind_args {
 };
 
 static int
-linux_bind(struct proc *p, struct linux_bind_args *args, int *retval)
+linux_bind(struct proc *p, struct linux_bind_args *args)
 {
     struct linux_bind_args linux_args;
     struct bind_args /* {
@@ -180,7 +180,7 @@ linux_bind(struct proc *p, struct linux_bind_args *args, int *retval)
     bsd_args.s = linux_args.s;
     bsd_args.name = (caddr_t)linux_args.name;
     bsd_args.namelen = linux_args.namelen;
-    return bind(p, &bsd_args, retval);
+    return bind(p, &bsd_args);
 }
 
 struct linux_connect_args {
@@ -190,7 +190,7 @@ struct linux_connect_args {
 };
 
 static int
-linux_connect(struct proc *p, struct linux_connect_args *args, int *retval)
+linux_connect(struct proc *p, struct linux_connect_args *args)
 {
     struct linux_connect_args linux_args;
     struct connect_args /* {
@@ -205,7 +205,7 @@ linux_connect(struct proc *p, struct linux_connect_args *args, int *retval)
     bsd_args.s = linux_args.s;
     bsd_args.name = (caddr_t)linux_args.name;
     bsd_args.namelen = linux_args.namelen;
-    return connect(p, &bsd_args, retval);
+    return connect(p, &bsd_args);
 }
 
 struct linux_listen_args {
@@ -214,7 +214,7 @@ struct linux_listen_args {
 };
 
 static int
-linux_listen(struct proc *p, struct linux_listen_args *args, int *retval)
+linux_listen(struct proc *p, struct linux_listen_args *args)
 {
     struct linux_listen_args linux_args;
     struct listen_args /* {
@@ -227,7 +227,7 @@ linux_listen(struct proc *p, struct linux_listen_args *args, int *retval)
 	return error;
     bsd_args.s = linux_args.s;
     bsd_args.backlog = linux_args.backlog;
-    return listen(p, &bsd_args, retval);
+    return listen(p, &bsd_args);
 }
 
 struct linux_accept_args {
@@ -237,7 +237,7 @@ struct linux_accept_args {
 };
 
 static int
-linux_accept(struct proc *p, struct linux_accept_args *args, int *retval)
+linux_accept(struct proc *p, struct linux_accept_args *args)
 {
     struct linux_accept_args linux_args;
     struct accept_args /* {
@@ -252,7 +252,7 @@ linux_accept(struct proc *p, struct linux_accept_args *args, int *retval)
     bsd_args.s = linux_args.s;
     bsd_args.name = (caddr_t)linux_args.addr;
     bsd_args.anamelen = linux_args.namelen;
-    return oaccept(p, &bsd_args, retval);
+    return oaccept(p, &bsd_args);
 }
 
 struct linux_getsockname_args {
@@ -262,7 +262,7 @@ struct linux_getsockname_args {
 };
 
 static int
-linux_getsockname(struct proc *p, struct linux_getsockname_args *args, int *retval)
+linux_getsockname(struct proc *p, struct linux_getsockname_args *args)
 {
     struct linux_getsockname_args linux_args;
     struct getsockname_args /* {
@@ -277,7 +277,7 @@ linux_getsockname(struct proc *p, struct linux_getsockname_args *args, int *retv
     bsd_args.fdes = linux_args.s;
     bsd_args.asa = (caddr_t) linux_args.addr;
     bsd_args.alen = linux_args.namelen;
-    return ogetsockname(p, &bsd_args, retval);
+    return ogetsockname(p, &bsd_args);
 }
 
 struct linux_getpeername_args {
@@ -287,7 +287,7 @@ struct linux_getpeername_args {
 };
 
 static int
-linux_getpeername(struct proc *p, struct linux_getpeername_args *args, int *retval)
+linux_getpeername(struct proc *p, struct linux_getpeername_args *args)
 {
     struct linux_getpeername_args linux_args;
     struct ogetpeername_args /* {
@@ -302,7 +302,7 @@ linux_getpeername(struct proc *p, struct linux_getpeername_args *args, int *retv
     bsd_args.fdes = linux_args.s;
     bsd_args.asa = (caddr_t) linux_args.addr;
     bsd_args.alen = linux_args.namelen;
-    return ogetpeername(p, &bsd_args, retval);
+    return ogetpeername(p, &bsd_args);
 }
 
 struct linux_socketpair_args {
@@ -313,7 +313,7 @@ struct linux_socketpair_args {
 };
 
 static int
-linux_socketpair(struct proc *p, struct linux_socketpair_args *args, int *retval)
+linux_socketpair(struct proc *p, struct linux_socketpair_args *args)
 {
     struct linux_socketpair_args linux_args;
     struct socketpair_args /* {
@@ -332,7 +332,7 @@ linux_socketpair(struct proc *p, struct linux_socketpair_args *args, int *retval
     bsd_args.type = linux_args.type;
     bsd_args.protocol = linux_args.protocol;
     bsd_args.rsv = linux_args.rsv;
-    return socketpair(p, &bsd_args, retval);
+    return socketpair(p, &bsd_args);
 }
 
 struct linux_send_args {
@@ -343,7 +343,7 @@ struct linux_send_args {
 };
 
 static int
-linux_send(struct proc *p, struct linux_send_args *args, int *retval)
+linux_send(struct proc *p, struct linux_send_args *args)
 {
     struct linux_send_args linux_args;
     struct osend_args /* {
@@ -360,7 +360,7 @@ linux_send(struct proc *p, struct linux_send_args *args, int *retval)
     bsd_args.buf = linux_args.msg;
     bsd_args.len = linux_args.len;
     bsd_args.flags = linux_args.flags;
-    return osend(p, &bsd_args, retval);
+    return osend(p, &bsd_args);
 }
 
 struct linux_recv_args {
@@ -371,7 +371,7 @@ struct linux_recv_args {
 };
 
 static int
-linux_recv(struct proc *p, struct linux_recv_args *args, int *retval)
+linux_recv(struct proc *p, struct linux_recv_args *args)
 {
     struct linux_recv_args linux_args;
     struct orecv_args /* {
@@ -388,7 +388,7 @@ linux_recv(struct proc *p, struct linux_recv_args *args, int *retval)
     bsd_args.buf = linux_args.msg;
     bsd_args.len = linux_args.len;
     bsd_args.flags = linux_args.flags;
-    return orecv(p, &bsd_args, retval);
+    return orecv(p, &bsd_args);
 }
 
 struct linux_sendto_args {
@@ -401,7 +401,7 @@ struct linux_sendto_args {
 };
 
 static int
-linux_sendto(struct proc *p, struct linux_sendto_args *args, int *retval)
+linux_sendto(struct proc *p, struct linux_sendto_args *args)
 {
     struct linux_sendto_args linux_args;
     struct sendto_args /* {
@@ -422,7 +422,7 @@ linux_sendto(struct proc *p, struct linux_sendto_args *args, int *retval)
     bsd_args.flags = linux_args.flags;
     bsd_args.to = linux_args.to;
     bsd_args.tolen = linux_args.tolen;
-    return sendto(p, &bsd_args, retval);
+    return sendto(p, &bsd_args);
 }
 
 struct linux_recvfrom_args {
@@ -435,7 +435,7 @@ struct linux_recvfrom_args {
 };
 
 static int
-linux_recvfrom(struct proc *p, struct linux_recvfrom_args *args, int *retval)
+linux_recvfrom(struct proc *p, struct linux_recvfrom_args *args)
 {
     struct linux_recvfrom_args linux_args;
     struct recvfrom_args /* {
@@ -456,7 +456,7 @@ linux_recvfrom(struct proc *p, struct linux_recvfrom_args *args, int *retval)
     bsd_args.flags = linux_args.flags;
     bsd_args.from = linux_args.from;
     bsd_args.fromlenaddr = linux_args.fromlen;
-    return orecvfrom(p, &bsd_args, retval);
+    return orecvfrom(p, &bsd_args);
 }
 
 struct linux_shutdown_args {
@@ -465,7 +465,7 @@ struct linux_shutdown_args {
 };
 
 static int
-linux_shutdown(struct proc *p, struct linux_shutdown_args *args, int *retval)
+linux_shutdown(struct proc *p, struct linux_shutdown_args *args)
 {
     struct linux_shutdown_args linux_args;
     struct shutdown_args /* {
@@ -478,7 +478,7 @@ linux_shutdown(struct proc *p, struct linux_shutdown_args *args, int *retval)
 	return error;
     bsd_args.s = linux_args.s;
     bsd_args.how = linux_args.how;
-    return shutdown(p, &bsd_args, retval);
+    return shutdown(p, &bsd_args);
 }
 
 struct linux_setsockopt_args {
@@ -490,7 +490,7 @@ struct linux_setsockopt_args {
 };
 
 static int
-linux_setsockopt(struct proc *p, struct linux_setsockopt_args *args, int *retval)
+linux_setsockopt(struct proc *p, struct linux_setsockopt_args *args)
 {
     struct linux_setsockopt_args linux_args;
     struct setsockopt_args /* {
@@ -521,7 +521,7 @@ linux_setsockopt(struct proc *p, struct linux_setsockopt_args *args, int *retval
     bsd_args.name = name;
     bsd_args.val = linux_args.optval;
     bsd_args.valsize = linux_args.optlen;
-    return setsockopt(p, &bsd_args, retval);
+    return setsockopt(p, &bsd_args);
 }
 
 struct linux_getsockopt_args {
@@ -533,7 +533,7 @@ struct linux_getsockopt_args {
 };
 
 static int
-linux_getsockopt(struct proc *p, struct linux_getsockopt_args *args, int *retval)
+linux_getsockopt(struct proc *p, struct linux_getsockopt_args *args)
 {
     struct linux_getsockopt_args linux_args;
     struct getsockopt_args /* {
@@ -563,43 +563,43 @@ linux_getsockopt(struct proc *p, struct linux_getsockopt_args *args, int *retval
 	return EINVAL;
     bsd_args.val = linux_args.optval;
     bsd_args.avalsize = linux_args.optlen;
-    return getsockopt(p, &bsd_args, retval);
+    return getsockopt(p, &bsd_args);
 }
 
 int
-linux_socketcall(struct proc *p, struct linux_socketcall_args *args,int *retval)
+linux_socketcall(struct proc *p, struct linux_socketcall_args *args)
 {
     switch (args->what) {
     case LINUX_SOCKET:
-	return linux_socket(p, args->args, retval);
+	return linux_socket(p, args->args);
     case LINUX_BIND:
-	return linux_bind(p, args->args, retval);
+	return linux_bind(p, args->args);
     case LINUX_CONNECT:
-	return linux_connect(p, args->args, retval);
+	return linux_connect(p, args->args);
     case LINUX_LISTEN:
-	return linux_listen(p, args->args, retval);
+	return linux_listen(p, args->args);
     case LINUX_ACCEPT:
-	return linux_accept(p, args->args, retval);
+	return linux_accept(p, args->args);
     case LINUX_GETSOCKNAME:
-	return linux_getsockname(p, args->args, retval);
+	return linux_getsockname(p, args->args);
     case LINUX_GETPEERNAME:
-	return linux_getpeername(p, args->args, retval);
+	return linux_getpeername(p, args->args);
     case LINUX_SOCKETPAIR:
-	return linux_socketpair(p, args->args, retval);
+	return linux_socketpair(p, args->args);
     case LINUX_SEND:
-	return linux_send(p, args->args, retval);
+	return linux_send(p, args->args);
     case LINUX_RECV:
-	return linux_recv(p, args->args, retval);
+	return linux_recv(p, args->args);
     case LINUX_SENDTO:
-	return linux_sendto(p, args->args, retval);
+	return linux_sendto(p, args->args);
     case LINUX_RECVFROM:
-	return linux_recvfrom(p, args->args, retval);
+	return linux_recvfrom(p, args->args);
     case LINUX_SHUTDOWN:
-	return linux_shutdown(p, args->args, retval);
+	return linux_shutdown(p, args->args);
     case LINUX_SETSOCKOPT:
-	return linux_setsockopt(p, args->args, retval);
+	return linux_setsockopt(p, args->args);
     case LINUX_GETSOCKOPT:
-	return linux_getsockopt(p, args->args, retval);
+	return linux_getsockopt(p, args->args);
     default:
 	uprintf("LINUX: 'socket' typ=%d not implemented\n", args->what);
 	return ENOSYS;
diff --git a/sys/i386/linux/linux_stats.c b/sys/i386/linux/linux_stats.c
index 2505d74..3606e20 100644
--- a/sys/i386/linux/linux_stats.c
+++ b/sys/i386/linux/linux_stats.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$
+ *  $Id: linux_stats.c,v 1.8 1997/02/22 09:38:25 peter Exp $
  */
 
 #include <sys/param.h>
@@ -91,7 +91,7 @@ newstat_copyout(struct stat *buf, void *ubuf)
 }
 
 int
-linux_newstat(struct proc *p, struct linux_newstat_args *args, int *retval)
+linux_newstat(struct proc *p, struct linux_newstat_args *args)
 {
     struct stat buf;
     struct nameidata nd;
@@ -119,10 +119,9 @@ linux_newstat(struct proc *p, struct linux_newstat_args *args, int *retval)
  * Get file status; this version does not follow links.
  */
 int
-linux_newlstat(p, uap, retval)
+linux_newlstat(p, uap)
 	struct proc *p;
 	struct linux_newlstat_args *uap;
-	int *retval;
 {
 	int error;
 	struct vnode *vp, *dvp;
@@ -178,7 +177,7 @@ linux_newlstat(p, uap, retval)
 }
 
 int
-linux_newfstat(struct proc *p, struct linux_newfstat_args *args, int *retval)
+linux_newfstat(struct proc *p, struct linux_newfstat_args *args)
 {
     struct filedesc *fdp = p->p_fd;
     struct file *fp;
@@ -224,7 +223,7 @@ struct linux_statfs_buf {
 };
 
 int
-linux_statfs(struct proc *p, struct linux_statfs_args *args, int *retval)
+linux_statfs(struct proc *p, struct linux_statfs_args *args)
 {
 	struct mount *mp;
 	struct nameidata *ndp;
@@ -265,7 +264,7 @@ linux_statfs(struct proc *p, struct linux_statfs_args *args, int *retval)
 }
 
 int
-linux_fstatfs(struct proc *p, struct linux_fstatfs_args *args, int *retval)
+linux_fstatfs(struct proc *p, struct linux_fstatfs_args *args)
 {
 	struct file *fp;
 	struct mount *mp;
diff --git a/sys/i386/linux/linux_sysvec.c b/sys/i386/linux/linux_sysvec.c
index f52cc6b..45f805d 100644
--- a/sys/i386/linux/linux_sysvec.c
+++ b/sys/i386/linux/linux_sysvec.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: linux_sysvec.c,v 1.18 1997/08/25 23:41:39 bde Exp $
+ *  $Id: linux_sysvec.c,v 1.19 1997/09/01 02:12:39 bde Exp $
  */
 
 /* XXX we use functions that might not exist. */
@@ -268,10 +268,9 @@ linux_sendsig(sig_t catcher, int sig, int mask, u_long code)
  * a machine fault.
  */
 int
-linux_sigreturn(p, args, retval)
+linux_sigreturn(p, args)
 	struct proc *p;
 	struct linux_sigreturn_args *args;
-	int *retval;
 {
 	struct linux_sigcontext *scp, context;
 	register struct trapframe *regs;