From 7d7396c4140bf5c44985b264a89ce155268f4e8e Mon Sep 17 00:00:00 2001
From: thorpej <thorpej@NetBSD.org>
Date: Tue, 19 Sep 1995 22:53:47 +0000
Subject: [PATCH] Make system calls conform to a standard prototype and bring
 those prototypes into scope.

---
 sys/arch/alpha/alpha/machdep.c             |  11 +-
 sys/arch/alpha/alpha/sys_machdep.c         |  11 +-
 sys/arch/amiga/amiga/machdep.c             |  11 +-
 sys/arch/amiga/amiga/sys_machdep.c         |  22 +-
 sys/arch/atari/atari/machdep.c             |  11 +-
 sys/arch/atari/atari/sys_machdep.c         |  25 +-
 sys/arch/hp300/hp300/machdep.c             |  11 +-
 sys/arch/hp300/hp300/sys_machdep.c         |  18 +-
 sys/arch/i386/i386/linux_machdep.c         |  47 ++--
 sys/arch/i386/i386/machdep.c               |  11 +-
 sys/arch/i386/i386/svr4_machdep.c          |   7 +-
 sys/arch/i386/i386/sys_machdep.c           |  11 +-
 sys/arch/mac68k/mac68k/machdep.c           |  11 +-
 sys/arch/mac68k/mac68k/sys_machdep.c       |  25 +-
 sys/arch/mips/mips/sys_machdep.c           |  23 +-
 sys/arch/mvme68k/mvme68k/machdep.c         |  11 +-
 sys/arch/mvme68k/mvme68k/sys_machdep.c     |  25 +-
 sys/arch/pc532/pc532/machdep.c             |  21 +-
 sys/arch/pc532/pc532/sys_machdep.c         |  13 +-
 sys/arch/pmax/pmax/machdep.c               |  11 +-
 sys/arch/pmax/pmax/sys_machdep.c           |  23 +-
 sys/arch/sparc/sparc/machdep.c             |  11 +-
 sys/arch/sparc/sparc/sunos_machdep.c       |  10 +-
 sys/arch/sparc/sparc/svr4_machdep.c        |   8 +-
 sys/arch/sparc/sparc/sys_machdep.c         |  11 +-
 sys/arch/sun3/sun3/machdep.c               |   7 +-
 sys/arch/vax/vax/machdep.c                 |   9 +-
 sys/arch/vax/vax/vm_machdep.c              |  14 +-
 sys/compat/hpux/hpux_compat.c              | 269 +++++++++++++--------
 sys/compat/hpux/hpux_net.c                 |  26 +-
 sys/compat/hpux/hpux_sig.c                 |  52 ++--
 sys/compat/hpux/hpux_tty.c                 |  14 +-
 sys/compat/linux/arch/i386/linux_machdep.c |  47 ++--
 sys/compat/linux/i386/linux_machdep.c      |  47 ++--
 34 files changed, 529 insertions(+), 355 deletions(-)

diff --git a/sys/arch/alpha/alpha/machdep.c b/sys/arch/alpha/alpha/machdep.c
index 43a3f55d5809..95789307bc9b 100644
--- a/sys/arch/alpha/alpha/machdep.c
+++ b/sys/arch/alpha/alpha/machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.9 1995/09/01 20:06:33 mycroft Exp $	*/
+/*	$NetBSD: machdep.c,v 1.10 1995/09/19 23:00:52 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1994, 1995 Carnegie-Mellon University.
@@ -1126,13 +1126,14 @@ sendsig(catcher, sig, mask, code)
  * a machine fault.
  */
 /* ARGSUSED */
-sigreturn(p, uap, retval)
+sigreturn(p, v, retval)
 	struct proc *p;
-	struct sigreturn_args /* {
-		syscallarg(struct sigcontext *) sigcntxp;
-	} */ *uap;
+	void *v;
 	register_t *retval;
 {
+	struct sigreturn_args /* {
+		syscallarg(struct sigcontext *) sigcntxp;
+	} */ *uap = v;
 	struct sigcontext *scp, ksc;
 	extern struct proc *fpcurproc;
 
diff --git a/sys/arch/alpha/alpha/sys_machdep.c b/sys/arch/alpha/alpha/sys_machdep.c
index 10a45d285c21..ae9b527ec85f 100644
--- a/sys/arch/alpha/alpha/sys_machdep.c
+++ b/sys/arch/alpha/alpha/sys_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: sys_machdep.c,v 1.1 1995/02/13 23:07:15 cgd Exp $	*/
+/*	$NetBSD: sys_machdep.c,v 1.2 1995/09/19 23:00:53 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1994, 1995 Carnegie-Mellon University.
@@ -34,14 +34,15 @@
 #include <sys/syscallargs.h>
 
 int
-sysarch(p, uap, retval)
+sysarch(p, v, retval)
 	struct proc *p;
+	void *v;
+	register_t *retval;
+{
 	struct sysarch_args /* {
 		syscallarg(int) op;
 		syscallarg(char *) parms;
-	} */ *uap;
-	register_t *retval;
-{
+	} */ *uap = v;
 
 	return (ENOSYS);
 }
diff --git a/sys/arch/amiga/amiga/machdep.c b/sys/arch/amiga/amiga/machdep.c
index aa6eae888e6d..0af5ae669a69 100644
--- a/sys/arch/amiga/amiga/machdep.c
+++ b/sys/arch/amiga/amiga/machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.55 1995/09/16 16:11:06 chopps Exp $	*/
+/*	$NetBSD: machdep.c,v 1.56 1995/09/19 23:06:31 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -691,13 +691,14 @@ sendsig(catcher, sig, mask, code)
  * a machine fault.
  */
 /* ARGSUSED */
-sigreturn(p, uap, retval)
+sigreturn(p, v, retval)
 	struct proc *p;
-	struct sigreturn_args /* {
-		syscallarg(struct sigcontext *) sigcntxp;
-	} */ *uap;
+	void *v;
 	register_t *retval;
 {
+	struct sigreturn_args /* {
+		syscallarg(struct sigcontext *) sigcntxp;
+	} */ *uap = v;
 	struct sigcontext *scp, context;
 	struct frame *frame;
 	int rf, flags;
diff --git a/sys/arch/amiga/amiga/sys_machdep.c b/sys/arch/amiga/amiga/sys_machdep.c
index d3a3fe76e066..0fe1b980a534 100644
--- a/sys/arch/amiga/amiga/sys_machdep.c
+++ b/sys/arch/amiga/amiga/sys_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: sys_machdep.c,v 1.10 1995/08/18 15:27:38 chopps Exp $	*/
+/*	$NetBSD: sys_machdep.c,v 1.11 1995/09/19 23:06:34 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1982, 1986 Regents of the University of California.
@@ -55,14 +55,15 @@
 #ifdef TRACE
 int	nvualarm;
 
-vtrace(p, uap, retval)
+vtrace(p, v, retval)
 	struct proc *p;
+	void *v;
+	register_t *retval;
+{
 	register struct vtrace_args /* {
 		syscallarg(int) request;
 		syscallarg(int) value;
-	} */ *uap;
-	register_t *retval;
-{
+	} */ *uap = v;
 	int vdoualarm();
 
 	switch (SCARG(uap, request)) {
@@ -270,14 +271,15 @@ dma_cachectl(addr, len)
 }
 
 int
-sysarch(p, uap, retval)
+sysarch(p, v, retval)
 	struct proc *p;
+	void *v;
+	register_t *retval;
+{
 	struct sysarch_args /* {
 		syscallarg(int) op;
 		syscallarg(char *) parms;
-	} */ *uap;
-	register_t *retval;
-{
+	} */ *uap = v;
+
 	return ENOSYS;
 }
-
diff --git a/sys/arch/atari/atari/machdep.c b/sys/arch/atari/atari/machdep.c
index cce9962359d1..2cf87f3f0bda 100644
--- a/sys/arch/atari/atari/machdep.c
+++ b/sys/arch/atari/atari/machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.14 1995/09/01 20:06:35 mycroft Exp $	*/
+/*	$NetBSD: machdep.c,v 1.15 1995/09/19 23:08:09 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -637,13 +637,14 @@ sendsig(catcher, sig, mask, code)
  * a machine fault.
  */
 /* ARGSUSED */
-sigreturn(p, uap, retval)
+sigreturn(p, v, retval)
 	struct proc *p;
-	struct sigreturn_args /* {
-		syscallarg(struct sigcontext *)sigcntxp;
-		} */ *uap;
+	void *v;
 	register_t *retval;
 {
+	struct sigreturn_args /* {
+		syscallarg(struct sigcontext *)sigcntxp;
+	} */ *uap = v;
 	struct sigcontext *scp, context;
 	struct frame *frame;
 	int rf, flags;
diff --git a/sys/arch/atari/atari/sys_machdep.c b/sys/arch/atari/atari/sys_machdep.c
index 785b4cf5e056..af88384c99b9 100644
--- a/sys/arch/atari/atari/sys_machdep.c
+++ b/sys/arch/atari/atari/sys_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: sys_machdep.c,v 1.1.1.1 1995/03/26 07:12:18 leo Exp $	*/
+/*	$NetBSD: sys_machdep.c,v 1.2 1995/09/19 23:08:11 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1982, 1986 Regents of the University of California.
@@ -55,14 +55,15 @@
 #ifdef TRACE
 int	nvualarm;
 
-vtrace(p, uap, retval)
+vtrace(p, v, retval)
 	struct proc *p;
-	register struct vtrace_args /* {
-		syscallarg(int)	request;
-		syscallarg(int)	value;
-	} */ *uap;
+	void *v;
 	register_t *retval;
 {
+	register struct vtrace_args /* {
+		syscallarg(int) request;
+		syscallarg(int) value;
+	} */ *uap = v;
 	int vdoualarm();
 
 	switch(SCARG(uap, request)) {
@@ -270,14 +271,16 @@ dma_cachectl(addr, len)
 }
 
 int
-sysarch(p, uap, retval)
+sysarch(p, v, retval)
 	struct proc *p;
-	struct sysarch_args /* {
-		syscallarg(int)	op;
-		syscallarg(char*)parms;
-	} */ *uap;
+	void *v;
 	register_t *retval;
 {
+	struct sysarch_args /* {
+		syscallarg(int) op;
+		syscallarg(char*)parms; 
+	} */ *uap = v;
+
 	return ENOSYS;
 }
 
diff --git a/sys/arch/hp300/hp300/machdep.c b/sys/arch/hp300/hp300/machdep.c
index 9942bc91c1bf..74a943d62e5f 100644
--- a/sys/arch/hp300/hp300/machdep.c
+++ b/sys/arch/hp300/hp300/machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.50 1995/09/01 20:06:03 mycroft Exp $	*/
+/*	$NetBSD: machdep.c,v 1.51 1995/09/19 23:09:27 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -929,13 +929,14 @@ sendsig(catcher, sig, mask, code)
  * a machine fault.
  */
 /* ARGSUSED */
-sigreturn(p, uap, retval)
+sigreturn(p, v, retval)
 	struct proc *p;
-	struct sigreturn_args /* {
-		syscallarg(struct sigcontext *) sigcntxp;
-	} */ *uap;
+	void *v;
 	register_t *retval;
 {
+	struct sigreturn_args /* {
+		syscallarg(struct sigcontext *) sigcntxp;
+	} */ *uap = v;
 	register struct sigcontext *scp;
 	register struct frame *frame;
 	register int rf;
diff --git a/sys/arch/hp300/hp300/sys_machdep.c b/sys/arch/hp300/hp300/sys_machdep.c
index b659b4dc5f6a..398e1e61c516 100644
--- a/sys/arch/hp300/hp300/sys_machdep.c
+++ b/sys/arch/hp300/hp300/sys_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: sys_machdep.c,v 1.8 1995/04/22 20:25:54 christos Exp $	*/
+/*	$NetBSD: sys_machdep.c,v 1.9 1995/09/19 23:09:29 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1982, 1986, 1993
@@ -49,17 +49,20 @@
 
 #include <vm/vm.h>
 
+#include <sys/syscallargs.h>
+
 #ifdef TRACE
 int	nvualarm;
 
-vtrace(p, uap, retval)
+vtrace(p, v, retval)
 	struct proc *p;
+	void *v;
+	register_t *retval;
+{
 	register struct vtrace_args /* {
 		syscallarg(int) request;
 		syscallarg(int) value;
-	} */ *uap;
-	register_t *retval;
-{
+	} */ *uap = v;
 	int vdoualarm();
 
 	switch (SCARG(uap, request)) {
@@ -259,5 +262,10 @@ sysarch(p, uap, retval)
 	} */ *uap;
 	register_t *retval;
 {
+	struct sysarch_args /* {
+		syscallarg(int) op; 
+		syscallarg(char *) parms;
+	} */ *uap = v;
+
 	return ENOSYS;
 }
diff --git a/sys/arch/i386/i386/linux_machdep.c b/sys/arch/i386/i386/linux_machdep.c
index 61a6af2fc24e..14fc6554e34d 100644
--- a/sys/arch/i386/i386/linux_machdep.c
+++ b/sys/arch/i386/i386/linux_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: linux_machdep.c,v 1.18 1995/09/08 07:57:15 fvdl Exp $	*/
+/*	$NetBSD: linux_machdep.c,v 1.19 1995/09/19 22:56:37 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1995 Frank van der Linden
@@ -191,13 +191,14 @@ linux_sendsig(catcher, sig, mask, code)
  * a machine fault.
  */
 int
-linux_sigreturn(p, uap, retval)
+linux_sigreturn(p, v, retval)
 	struct proc *p;
-	struct linux_sigreturn_args /* {
-		syscallarg(struct linux_sigcontext *) scp;
-	} */ *uap;
+	void *v;
 	register_t *retval;
 {
+	struct linux_sigreturn_args /* {
+		syscallarg(struct linux_sigcontext *) scp;
+	} */ *uap = v;
 	struct linux_sigcontext *scp, context;
 	register struct trapframe *tf;
 
@@ -363,15 +364,16 @@ linux_write_ldt(p, uap, retval)
 #endif /* USER_LDT */
 
 int
-linux_modify_ldt(p, uap, retval)
+linux_modify_ldt(p, v, retval)
 	struct proc *p;
+	void *v;
+	register_t *retval;
+{
 	struct linux_modify_ldt_args /* {
 		syscallarg(int) func;
 		syscallarg(void *) ptr;
 		syscallarg(size_t) bytecount;
-	} */ *uap;
-	register_t *retval;
-{
+	} */ *uap = v;
 
 	switch (SCARG(uap, func)) {
 #ifdef USER_LDT
@@ -406,15 +408,16 @@ linux_fakedev(dev)
  * We come here in a last attempt to satisfy a Linux ioctl() call
  */
 int
-linux_machdepioctl(p, uap, retval)
+linux_machdepioctl(p, v, retval)
 	struct proc *p;
+	void *v;
+	register_t *retval;
+{
 	struct linux_ioctl_args /* {
 		syscallarg(int) fd;
 		syscallarg(u_long) com;
 		syscallarg(caddr_t) data;
-	} */ *uap;
-	register_t *retval;
-{
+	} */ *uap = v;
 	struct ioctl_args bia, tmparg;
 	u_long com;
 #if NVT > 0
@@ -514,13 +517,14 @@ linux_machdepioctl(p, uap, retval)
  * to rely on I/O permission maps, which are not implemented.
  */
 int
-linux_iopl(p, uap, retval)
+linux_iopl(p, v, retval)
 	struct proc *p;
-	struct linux_iopl_args /* {
-		syscallarg(int) level;
-	} */ *uap;
+	void *v;
 	register_t *retval;
 {
+	struct linux_iopl_args /* {
+		syscallarg(int) level;
+	} */ *uap = v;
 	struct trapframe *fp = p->p_md.md_regs;
 
 	if (suser(p->p_ucred, &p->p_acflag) != 0)
@@ -535,15 +539,16 @@ linux_iopl(p, uap, retval)
  * just let it have the whole range.
  */
 int
-linux_ioperm(p, uap, retval)
+linux_ioperm(p, v, retval)
 	struct proc *p;
+	void *v;
+	register_t *retval;
+{
 	struct linux_ioperm_args /* {
 		syscallarg(unsigned int) lo;
 		syscallarg(unsigned int) hi;
 		syscallarg(int) val;
-	} */ *uap;
-	register_t *retval;
-{
+	} */ *uap = v;
 	struct trapframe *fp = p->p_md.md_regs;
 
 	if (suser(p->p_ucred, &p->p_acflag) != 0)
diff --git a/sys/arch/i386/i386/machdep.c b/sys/arch/i386/i386/machdep.c
index 548c1d257f68..125acb5b034b 100644
--- a/sys/arch/i386/i386/machdep.c
+++ b/sys/arch/i386/i386/machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.171 1995/09/01 20:06:06 mycroft Exp $	*/
+/*	$NetBSD: machdep.c,v 1.172 1995/09/19 22:56:40 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1993, 1994, 1995 Charles M. Hannum.  All rights reserved.
@@ -580,13 +580,14 @@ sendsig(catcher, sig, mask, code)
  * psl to gain improper privileges or to cause
  * a machine fault.
  */
-sigreturn(p, uap, retval)
+sigreturn(p, v, retval)
 	struct proc *p;
-	struct sigreturn_args /* {
-		syscallarg(struct sigcontext *) sigcntxp;
-	} */ *uap;
+	void *v;
 	register_t *retval;
 {
+	struct sigreturn_args /* {
+		syscallarg(struct sigcontext *) sigcntxp;
+	} */ *uap = v;
 	struct sigcontext *scp, context;
 	register struct trapframe *tf;
 
diff --git a/sys/arch/i386/i386/svr4_machdep.c b/sys/arch/i386/i386/svr4_machdep.c
index db58f70edb0e..acf7e3e6362e 100644
--- a/sys/arch/i386/i386/svr4_machdep.c
+++ b/sys/arch/i386/i386/svr4_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: svr4_machdep.c,v 1.14 1995/09/01 20:06:09 mycroft Exp $	 */
+/*	$NetBSD: svr4_machdep.c,v 1.15 1995/09/19 22:56:42 thorpej Exp $	 */
 
 /*
  * Copyright (c) 1994 Christos Zoulas
@@ -385,11 +385,12 @@ svr4_sendsig(catcher, sig, mask, code)
  * sysi86
  */
 int
-svr4_sysarch(p, uap, retval)
+svr4_sysarch(p, v, retval)
 	struct proc *p;
-	struct svr4_sysarch_args *uap;
+	void *v;
 	register_t *retval;
 {
+	struct svr4_sysarch_args *uap = v;
 	caddr_t sg = stackgap_init(p->p_emul);
 	int error;
 	*retval = 0;	/* XXX: What to do */
diff --git a/sys/arch/i386/i386/sys_machdep.c b/sys/arch/i386/i386/sys_machdep.c
index 3067d542d9f4..b6dff59e4dc7 100644
--- a/sys/arch/i386/i386/sys_machdep.c
+++ b/sys/arch/i386/i386/sys_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: sys_machdep.c,v 1.18 1995/05/06 19:22:39 mycroft Exp $	*/
+/*	$NetBSD: sys_machdep.c,v 1.19 1995/09/19 22:56:44 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1995 Charles M. Hannum.  All rights reserved.
@@ -310,14 +310,15 @@ i386_set_ldt(p, args, retval)
 #endif	/* USER_LDT */
 
 int
-sysarch(p, uap, retval)
+sysarch(p, v, retval)
 	struct proc *p;
+	void *v;
+	register_t *retval;
+{
 	struct sysarch_args /* {
 		syscallarg(int) op;
 		syscallarg(char *) parms;
-	} */ *uap;
-	register_t *retval;
-{
+	} */ *uap = v;
 	int error = 0;
 
 	switch(SCARG(uap, op)) {
diff --git a/sys/arch/mac68k/mac68k/machdep.c b/sys/arch/mac68k/mac68k/machdep.c
index de5ef0901df0..a517eefee60e 100644
--- a/sys/arch/mac68k/mac68k/machdep.c
+++ b/sys/arch/mac68k/mac68k/machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.75 1995/09/19 03:18:15 briggs Exp $	*/
+/*	$NetBSD: machdep.c,v 1.76 1995/09/19 23:12:46 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -664,13 +664,14 @@ sendsig(catcher, sig, mask, code)
  * a machine fault.
  */
 /* ARGSUSED */
-sigreturn(p, uap, retval)
+sigreturn(p, v, retval)
 	struct proc *p;
-	struct sigreturn_args	/* {
-		syscallarg(struct sigcontext *) sigcntxp;
-	} */ *uap;
+	void *v;
 	register_t *retval;
 {
+	struct sigreturn_args   /* {
+		syscallarg(struct sigcontext *) sigcntxp;
+	} */ *uap = v;
 	extern short	exframesize[];
 	struct sigcontext *scp, context;
 	struct frame	*frame;
diff --git a/sys/arch/mac68k/mac68k/sys_machdep.c b/sys/arch/mac68k/mac68k/sys_machdep.c
index f4a27b6f69ba..885bd7cdf61b 100644
--- a/sys/arch/mac68k/mac68k/sys_machdep.c
+++ b/sys/arch/mac68k/mac68k/sys_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: sys_machdep.c,v 1.4 1994/10/26 08:47:16 cgd Exp $	*/
+/*	$NetBSD: sys_machdep.c,v 1.5 1995/09/19 23:12:50 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1990 The Regents of the University of California.
@@ -81,17 +81,20 @@
 #include "sys/buf.h"
 #include "sys/trace.h"
 
+#include <sys/syscallargs.h>
+
 #ifdef TRACE
 int	nvualarm;
 
-vtrace(p, uap, retval)
+vtrace(p, v, retval)
 	struct proc *p;
+	void *v;
+	register_t *retval;
+{
 	register struct vtrace_args /* {
 		syscallarg(int) request;
 		syscallarg(int) value;
-	} */ *uap;
-	register_t *retval;
-{
+	} */ *uap = v;
 	int vdoualarm();
 
 	switch (uap->request) {
@@ -173,13 +176,15 @@ cachectl(req, addr, len)
 	return(error);
 }
 
-int sysarch(p, uap, retval)
+int sysarch(p, v, retval)
 	struct proc *p;
-	struct sysarch_args /* {
-		syscallarg(int) op;
-		syscallarg(char *) parms;
-	} */ *uap;
+	void *v;
 	register_t *retval;
 {
+	struct sysarch_args /* {
+		syscallarg(int) op; 
+		syscallarg(char *) parms;
+	} */ *uap = v;
+
 	return ENOSYS;
 }
diff --git a/sys/arch/mips/mips/sys_machdep.c b/sys/arch/mips/mips/sys_machdep.c
index fabbe4c48158..4f9411deff76 100644
--- a/sys/arch/mips/mips/sys_machdep.c
+++ b/sys/arch/mips/mips/sys_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: sys_machdep.c,v 1.6 1994/10/26 21:10:42 cgd Exp $	*/
+/*	$NetBSD: sys_machdep.c,v 1.7 1995/09/19 23:03:45 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -50,17 +50,20 @@
 #include <sys/buf.h>
 #include <sys/trace.h>
 
+#include <sys/syscallargs.h>
+
 #ifdef TRACE
 int	nvualarm;
 
-vtrace(p, uap, retval)
+vtrace(p, v, retval)
 	struct proc *p;
+	void *v;
+	register_t *retval;
+{
 	register struct vtrace_args /* {
 		syscallarg(int) request;
 		syscallarg(int) value;
-	} */ *uap;
-	register_t *retval;
-{
+	} */ *uap = v;
 	int vdoualarm();
 
 	switch (SCARG(uap, request)) {
@@ -107,13 +110,15 @@ vdoualarm(arg)
 #endif
 
 int
-sysarch(p, uap, retval)
+sysarch(p, v, retval)
 	struct proc *p;
+	void *v;
+	register_t *retval;
+{
 	struct sysarch_args /* {
 		syscallarg(int) op;
 		syscallarg(char *) parms;
-	} */ *uap;
-	register_t *retval;
-{
+	} */ *uap = v;
+
 	return ENOSYS;
 }
diff --git a/sys/arch/mvme68k/mvme68k/machdep.c b/sys/arch/mvme68k/mvme68k/machdep.c
index 0c171030efc0..40c94af36ed7 100644
--- a/sys/arch/mvme68k/mvme68k/machdep.c
+++ b/sys/arch/mvme68k/mvme68k/machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.2 1995/09/01 20:06:38 mycroft Exp $	*/
+/*	$NetBSD: machdep.c,v 1.3 1995/09/19 23:14:21 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -850,13 +850,14 @@ sendsig(catcher, sig, mask, code)
  * a machine fault.
  */
 /* ARGSUSED */
-sigreturn(p, uap, retval)
+sigreturn(p, v, retval)
 	struct proc *p;
-	struct sigreturn_args /* {
-		syscallarg(struct sigcontext *) sigcntxp;
-	} */ *uap;
+	void *v;
 	register_t *retval;
 {
+	struct sigreturn_args /* {
+		syscallarg(struct sigcontext *) sigcntxp;
+	} */ *uap = v;
 	register struct sigcontext *scp;
 	register struct frame *frame;
 	register int rf;
diff --git a/sys/arch/mvme68k/mvme68k/sys_machdep.c b/sys/arch/mvme68k/mvme68k/sys_machdep.c
index f2498d0c8eea..aff49cd76ce0 100644
--- a/sys/arch/mvme68k/mvme68k/sys_machdep.c
+++ b/sys/arch/mvme68k/mvme68k/sys_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: sys_machdep.c,v 1.1.1.1 1995/07/25 23:12:00 chuck Exp $ */
+/*	$NetBSD: sys_machdep.c,v 1.2 1995/09/19 23:14:24 thorpej Exp $ */
 
 /*
  * Copyright (c) 1982, 1986, 1993
@@ -49,17 +49,20 @@
 
 #include <vm/vm.h>
 
+#include <sys/syscallargs.h>
+
 #ifdef TRACE
 int	nvualarm;
 
-vtrace(p, uap, retval)
+vtrace(p, v, retval)
 	struct proc *p;
+	void *v;
+	register_t *retval;
+{
 	register struct vtrace_args /* {
 		syscallarg(int) request;
 		syscallarg(int) value;
-	} */ *uap;
-	register_t *retval;
-{
+	} */ *uap = v;
 	int vdoualarm();
 
 	switch (SCARG(uap, request)) {
@@ -251,13 +254,15 @@ cachectl(req, addr, len)
 }
 
 int
-sysarch(p, uap, retval)
+sysarch(p, v, retval)
 	struct proc *p;
-	struct sysarch_args /* {
-		syscallarg(int) op;
-		syscallarg(char *) parms;
-	} */ *uap;
+	void *v;
 	register_t *retval;
 {
+	struct sysarch_args /* {
+		syscallarg(int) op; 
+		syscallarg(char *) parms;
+	} */ *uap = v;
+
 	return ENOSYS;
 }
diff --git a/sys/arch/pc532/pc532/machdep.c b/sys/arch/pc532/pc532/machdep.c
index 479d5b4e9758..d6132fbe9c6b 100644
--- a/sys/arch/pc532/pc532/machdep.c
+++ b/sys/arch/pc532/pc532/machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.38 1995/09/01 20:06:12 mycroft Exp $	*/
+/*	$NetBSD: machdep.c,v 1.39 1995/09/19 23:15:57 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1982, 1987, 1990 The Regents of the University of California.
@@ -593,13 +593,14 @@ sendsig(catcher, sig, mask, code)
  * a machine fault.
  */
 int
-sigreturn(p, uap, retval)
+sigreturn(p, v, retval)
 	struct proc *p;
-	struct sigreturn_args /* {
-		syscallarg(struct sigcontext *) sigcntxp;
-	} */ *uap;
+	void *v;
 	register_t *retval;
 {
+	struct sigreturn_args /* {
+		syscallarg(struct sigcontext *) sigcntxp;
+	} */ *uap = v;
 	register struct sigcontext *scp;
 	register struct sigframe *fp;
 	register int *regs = p->p_md.md_regs;
@@ -1039,14 +1040,16 @@ void reboot_cpu()
 }
 
 int
-sysarch(p, uap, retval)
+sysarch(p, v, retval)
 	struct proc *p;
+	void *v;
+	register_t *retval;
+{
 	struct sysarch_args /* {
 		syscallarg(int) op;
 		syscallarg(char *) parms;
-	} */ *uap;
-	register_t *retval;
-{
+	} */ *uap = v;
+
 	return ENOSYS;
 }
 
diff --git a/sys/arch/pc532/pc532/sys_machdep.c b/sys/arch/pc532/pc532/sys_machdep.c
index 03db3876bdc5..e9075407bc5a 100644
--- a/sys/arch/pc532/pc532/sys_machdep.c
+++ b/sys/arch/pc532/pc532/sys_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: sys_machdep.c,v 1.3 1994/10/26 08:25:18 cgd Exp $	*/
+/*	$NetBSD: sys_machdep.c,v 1.4 1995/09/19 23:16:01 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -50,17 +50,20 @@
 #include "buf.h"
 #include "trace.h"
 
+#include <sys/syscallargs.h>
+
 #ifdef TRACE
 int	nvualarm;
 
-vtrace(p, uap, retval)
+vtrace(p, v, retval)
 	struct proc *p;
+	void *v;
+	register_t *retval;
+{
 	register struct vtrace_args /* {
 		syscallarg(int) request;
 		syscallarg(int) value;
-	} */ *uap;
-	register_t *retval;
-{
+	} */ *uap = v;
 	int vdoualarm();
 
 	switch (SCARG(uap, request)) {
diff --git a/sys/arch/pmax/pmax/machdep.c b/sys/arch/pmax/pmax/machdep.c
index 29a6a1da6cd9..523b569e31a8 100644
--- a/sys/arch/pmax/pmax/machdep.c
+++ b/sys/arch/pmax/pmax/machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.36 1995/09/11 21:58:23 jonathan Exp $	*/
+/*	$NetBSD: machdep.c,v 1.37 1995/09/19 23:03:43 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -969,13 +969,14 @@ sendsig(catcher, sig, mask, code)
  * a machine fault.
  */
 /* ARGSUSED */
-sigreturn(p, uap, retval)
+sigreturn(p, v, retval)
 	struct proc *p;
-	struct sigreturn_args /* {
-		syscallarg(struct sigcontext *) sigcntxp;
-	} */ *uap;
+	void *v;
 	register_t *retval;
 {
+	struct sigreturn_args /* {
+		syscallarg(struct sigcontext *) sigcntxp;
+	} */ *uap = v;
 	register struct sigcontext *scp;
 	register int *regs;
 	struct sigcontext ksc;
diff --git a/sys/arch/pmax/pmax/sys_machdep.c b/sys/arch/pmax/pmax/sys_machdep.c
index fabbe4c48158..4f9411deff76 100644
--- a/sys/arch/pmax/pmax/sys_machdep.c
+++ b/sys/arch/pmax/pmax/sys_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: sys_machdep.c,v 1.6 1994/10/26 21:10:42 cgd Exp $	*/
+/*	$NetBSD: sys_machdep.c,v 1.7 1995/09/19 23:03:45 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -50,17 +50,20 @@
 #include <sys/buf.h>
 #include <sys/trace.h>
 
+#include <sys/syscallargs.h>
+
 #ifdef TRACE
 int	nvualarm;
 
-vtrace(p, uap, retval)
+vtrace(p, v, retval)
 	struct proc *p;
+	void *v;
+	register_t *retval;
+{
 	register struct vtrace_args /* {
 		syscallarg(int) request;
 		syscallarg(int) value;
-	} */ *uap;
-	register_t *retval;
-{
+	} */ *uap = v;
 	int vdoualarm();
 
 	switch (SCARG(uap, request)) {
@@ -107,13 +110,15 @@ vdoualarm(arg)
 #endif
 
 int
-sysarch(p, uap, retval)
+sysarch(p, v, retval)
 	struct proc *p;
+	void *v;
+	register_t *retval;
+{
 	struct sysarch_args /* {
 		syscallarg(int) op;
 		syscallarg(char *) parms;
-	} */ *uap;
-	register_t *retval;
-{
+	} */ *uap = v;
+
 	return ENOSYS;
 }
diff --git a/sys/arch/sparc/sparc/machdep.c b/sys/arch/sparc/sparc/machdep.c
index a7c6125a7dae..defe7bddae8e 100644
--- a/sys/arch/sparc/sparc/machdep.c
+++ b/sys/arch/sparc/sparc/machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.48 1995/09/01 20:06:18 mycroft Exp $ */
+/*	$NetBSD: machdep.c,v 1.49 1995/09/19 22:59:03 thorpej Exp $ */
 
 /*
  * Copyright (c) 1992, 1993
@@ -550,13 +550,14 @@ sendsig(catcher, sig, mask, code)
  * a machine fault.
  */
 /* ARGSUSED */
-sigreturn(p, uap, retval)
+sigreturn(p, v, retval)
 	register struct proc *p;
-	struct sigreturn_args /* {
-		syscallarg(struct sigcontext *) sigcntxp;
-	} */ *uap;
+	void *v;
 	register_t *retval;
 {
+	struct sigreturn_args /* {
+		syscallarg(struct sigcontext *) sigcntxp;
+	} */ *uap = v;
 	register struct sigcontext *scp;
 	register struct trapframe *tf;
 
diff --git a/sys/arch/sparc/sparc/sunos_machdep.c b/sys/arch/sparc/sparc/sunos_machdep.c
index 9dc64b5679ea..dc80efe0e4a3 100644
--- a/sys/arch/sparc/sparc/sunos_machdep.c
+++ b/sys/arch/sparc/sparc/sunos_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: sunos_machdep.c,v 1.1 1995/05/08 19:13:48 christos Exp $	*/
+/*	$NetBSD: sunos_machdep.c,v 1.2 1995/09/19 22:59:05 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1995 Matthew Green
@@ -43,13 +43,13 @@
 #include <sys/syscallargs.h>
 #include <compat/sunos/sunos_syscallargs.h>
 
-int sunos_sigreturn __P((struct proc *, struct sunos_sigreturn_args *, register_t *));
-
 int
-sunos_sigreturn(p, uap, retval)
+sunos_sigreturn(p, v, retval)
         register struct proc *p;
-	struct sunos_sigreturn_args *uap;
+	void *v;
 	register_t *retval;
 {
+	struct sunos_sigreturn_args *uap = v;
+
 	return (sigreturn(p, (struct sigreturn_args *)uap, retval));
 }
diff --git a/sys/arch/sparc/sparc/svr4_machdep.c b/sys/arch/sparc/sparc/svr4_machdep.c
index 3de19daffdbc..4a1a6578fab8 100644
--- a/sys/arch/sparc/sparc/svr4_machdep.c
+++ b/sys/arch/sparc/sparc/svr4_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: svr4_machdep.c,v 1.9 1995/09/01 20:06:20 mycroft Exp $	 */
+/*	$NetBSD: svr4_machdep.c,v 1.10 1995/09/19 22:59:06 thorpej Exp $	 */
 
 /*
  * Copyright (c) 1994 Christos Zoulas
@@ -471,11 +471,13 @@ svr4_trap(type, p)
 /*
  */
 int
-svr4_sysarch(p, uap, retval)
+svr4_sysarch(p, v, retval)
 	struct proc *p;
-	struct svr4_sysarch_args *uap;
+	void *v;
 	register_t *retval;
 {
+	struct svr4_sysarch_args *uap = v;
+
 	switch (SCARG(uap, op)) {
 	default:
 		printf("(sparc) svr4_sysarch(%d)\n", SCARG(uap, op));
diff --git a/sys/arch/sparc/sparc/sys_machdep.c b/sys/arch/sparc/sparc/sys_machdep.c
index 2ba12f4139f2..ea10211e30bf 100644
--- a/sys/arch/sparc/sparc/sys_machdep.c
+++ b/sys/arch/sparc/sparc/sys_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: sys_machdep.c,v 1.4 1994/11/20 20:54:40 deraadt Exp $ */
+/*	$NetBSD: sys_machdep.c,v 1.5 1995/09/19 22:59:08 thorpej Exp $ */
 
 /*
  * Copyright (c) 1992, 1993
@@ -114,14 +114,15 @@ vdoualarm(arg)
 }
 #endif
 
-sysarch(p, uap, retval)
+sysarch(p, v, retval)
 	struct proc *p;
+	void *v;
+	register_t *retval;
+{
 	struct sysarch_args /* {
 		syscallarg(int) op;
 		syscallarg(char *) parms;
-	} */ *uap;
-	register_t *retval;
-{
+	} */ *uap = v;
 	int error = 0;
 
 	switch(SCARG(uap, op)) {
diff --git a/sys/arch/sun3/sun3/machdep.c b/sys/arch/sun3/sun3/machdep.c
index 428f5cb81f1d..1f7ba84c26a7 100644
--- a/sys/arch/sun3/sun3/machdep.c
+++ b/sys/arch/sun3/sun3/machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.63 1995/09/01 20:06:22 mycroft Exp $	*/
+/*	$NetBSD: machdep.c,v 1.64 1995/09/19 23:17:12 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1994 Gordon W. Ross
@@ -612,11 +612,12 @@ sendsig(catcher, sig, mask, code)
  * a machine fault.
  */
 
-sigreturn(p, uap, retval)
+sigreturn(p, v, retval)
 	struct proc *p;
-	struct sigreturn_args *uap;
+	void *v;
 	register_t *retval;
 {
+	struct sigreturn_args *uap = v;
 	register struct sigcontext *scp;
 	register struct frame *frame;
 	register int rf;
diff --git a/sys/arch/vax/vax/machdep.c b/sys/arch/vax/vax/machdep.c
index aacf77a5ae37..aa87e7f008b0 100644
--- a/sys/arch/vax/vax/machdep.c
+++ b/sys/arch/vax/vax/machdep.c
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.16 1995/09/01 20:06:31 mycroft Exp $  */
+/* $NetBSD: machdep.c,v 1.17 1995/09/19 23:18:26 thorpej Exp $  */
 
 /*
  * Copyright (c) 1994 Ludd, University of Lule}, Sweden.
@@ -82,6 +82,8 @@
 #include "vm/vm_kern.h"
 #include "net/netisr.h"
 
+#include <sys/syscallargs.h>
+
 #include "ppp.h"	/* For NERISR_PPP */
 
 /*
@@ -353,11 +355,12 @@ struct sigretargs {
 	struct sigcontext *cntxp;
 };
 
-sigreturn(p, uap, retval)
+sigreturn(p, v, retval)
 	struct proc    *p;
-	struct sigretargs *uap;
+	void *v;
 	int            *retval;
 {
+	struct sigretargs *uap = v;
 	struct trapframe *scf;
 	struct sigcontext *cntx;
 
diff --git a/sys/arch/vax/vax/vm_machdep.c b/sys/arch/vax/vax/vm_machdep.c
index 0515db5dd622..fd61acd05247 100644
--- a/sys/arch/vax/vax/vm_machdep.c
+++ b/sys/arch/vax/vax/vm_machdep.c
@@ -1,4 +1,4 @@
-/*      $NetBSD: vm_machdep.c,v 1.14 1995/06/05 16:27:27 ragge Exp $       */
+/*      $NetBSD: vm_machdep.c,v 1.15 1995/09/19 23:18:28 thorpej Exp $       */
 
 #undef SWDEBUG
 /*
@@ -51,6 +51,8 @@
 #include "machine/trap.h"
 #include "machine/pcb.h"
 
+#include <sys/syscallargs.h>
+
 volatile int whichqs;
 
 /*
@@ -333,7 +335,15 @@ printf("Warning: reno_omagic\n");
 	return(error);
 }
 
-sysarch(){return(EINVAL);}
+int
+sysarch(p, v, retval)
+	struct proc *p;
+	void *v;
+	register_t *retval;
+{
+
+	return (ENOSYS);
+};
 
 /*
  * 4.3BSD Reno programs have an 1K header first in the executable
diff --git a/sys/compat/hpux/hpux_compat.c b/sys/compat/hpux/hpux_compat.c
index f2d7cc71e3ed..1d45006c4d57 100644
--- a/sys/compat/hpux/hpux_compat.c
+++ b/sys/compat/hpux/hpux_compat.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: hpux_compat.c,v 1.17 1995/06/24 20:17:54 christos Exp $	*/
+/*	$NetBSD: hpux_compat.c,v 1.18 1995/09/19 22:53:47 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -175,11 +175,12 @@ notimp(p, uap, retval, code, nargs, argsize)
  * HP-UX fork and vfork need to map the EAGAIN return value appropriately.
  */
 int
-hpux_fork(p, uap, retval)
+hpux_fork(p, v, retval)
 	struct proc *p;
-	struct hpux_fork_args *uap;
+	void *v;
 	register_t *retval;
 {
+	struct hpux_fork_args *uap = v;
 	int error;
 
 	error = fork(p, (struct fork_args *) uap, retval);
@@ -189,11 +190,12 @@ hpux_fork(p, uap, retval)
 }
 
 int
-hpux_vfork(p, uap, retval)
+hpux_vfork(p, v, retval)
 	struct proc *p;
-	struct hpux_vfork_args *uap;
+	void *v;
 	register_t *retval;
 {
+	struct hpux_vfork_args *uap = v;
 	int error;
 
 	error = vfork(p, (struct vfork_args *) uap, retval);
@@ -203,12 +205,14 @@ hpux_vfork(p, uap, retval)
 }
 
 int
-hpux_execv(p, uap, retval)
+hpux_execv(p, v, retval)
 	struct proc *p;
-	struct hpux_execv_args *uap;
+	void *v;
 	register_t *retval;
 {
+	struct hpux_execv_args *uap = v;
 	struct execve_args ap;
+
 	SCARG(&ap, path) = SCARG(uap, path);
 	SCARG(&ap, argp) = SCARG(uap, argp);
 	SCARG(&ap, envp) = NULL;
@@ -222,11 +226,13 @@ hpux_execv(p, uap, retval)
  * termination signal from BSD to HP-UX.
  */
 int
-hpux_wait3(p, uap, retval)
+hpux_wait3(p, v, retval)
 	struct proc *p;
-	struct hpux_wait3_args *uap;
+	void *v;
 	register_t *retval;
 {
+	struct hpux_wait3_args *uap = v;
+
 	/* rusage pointer must be zero */
 	if (SCARG(uap, rusage))
 		return (EINVAL);
@@ -239,11 +245,12 @@ hpux_wait3(p, uap, retval)
 }
 
 int
-hpux_wait(p, uap, retval)
+hpux_wait(p, v, retval)
 	register struct proc		*p;
-	register struct hpux_wait_args	*uap;
+	void				*v;
 	register_t			*retval;
 {
+	register struct hpux_wait_args = v;
 	struct wait4_args w4;
 	int error;
 	int sig;
@@ -291,11 +298,12 @@ hpux_wait(p, uap, retval)
 }
 
 int
-hpux_waitpid(p, uap, retval)
+hpux_waitpid(p, v, retval)
 	struct proc *p;
-	struct hpux_waitpid_args *uap;
+	void *v;
 	register_t *retval;
 {
+	struct hpux_waitpid_args *uap = v;
 	int rv, sig, xstat, error;
 
 	SCARG(uap, rusage) = 0;
@@ -334,12 +342,14 @@ hpux_waitpid(p, uap, retval)
  * Old creat system call.
  */
 int
-hpux_creat(p, uap, retval)
+hpux_creat(p, v, retval)
 	struct proc *p;
-	register struct hpux_creat_args *uap;
+	void *v;
 	register_t *retval;
 {
+	register struct hpux_creat_args *uap = v;
 	struct open_args oap;
+
 	SCARG(&oap, path) = SCARG(uap, path);
 	SCARG(&oap, flags) = O_WRONLY | O_CREAT | O_TRUNC;
 	SCARG(&oap, mode) = SCARG(uap, mode);
@@ -362,11 +372,12 @@ hpux_creat(p, uap, retval)
  * O_SYNCIO is removed entirely.
  */
 int
-hpux_open(p, uap, retval)
+hpux_open(p, v, retval)
 	struct proc *p;
-	register struct hpux_open_args *uap;
+	void *v;
 	register_t *retval;
 {
+	register struct hpux_open_args *uap = v;
 	int mode, error;
 
 	mode = SCARG(uap, mode);
@@ -399,11 +410,12 @@ hpux_open(p, uap, retval)
 }
 
 int
-hpux_fcntl(p, uap, retval)
+hpux_fcntl(p, v, retval)
 	struct proc *p;
-	register struct hpux_fcntl_args *uap;
+	void *v;
 	register_t *retval;
 {
+	register struct hpux_fcntl_args *uap = v;
 	int mode, error, flg = F_POSIX;
 	struct file *fp;
 	char *pop;
@@ -538,11 +550,12 @@ hpux_fcntl(p, uap, retval)
  *	FIOSNBIO:   return -1 and errno == EWOULDBLOCK
  */
 int
-hpux_read(p, uap, retval)
+hpux_read(p, v, retval)
 	struct proc *p;
-	struct hpux_read_args *uap;
+	void *v;
 	register_t *retval;
 {
+	struct hpux_read_args *uap = v;
 	int error;
 
 	error = read(p, (struct read_args *) uap, retval);
@@ -561,11 +574,12 @@ hpux_read(p, uap, retval)
 }
 
 int
-hpux_write(p, uap, retval)
+hpux_write(p, v, retval)
 	struct proc *p;
-	struct hpux_write_args *uap;
+	void *v;
 	register_t *retval;
 {
+	struct hpux_write_args *uap = v;
 	int error;
 
 	error = write(p, (struct write_args *) uap, retval);
@@ -584,11 +598,12 @@ hpux_write(p, uap, retval)
 }
 
 int
-hpux_readv(p, uap, retval)
+hpux_readv(p, v, retval)
 	struct proc *p;
-	struct hpux_readv_args *uap;
+	void *v;
 	register_t *retval;
 {
+	struct hpux_readv_args *uap = v;
 	int error;
 
 	error = readv(p, (struct readv_args *) uap, retval);
@@ -607,11 +622,12 @@ hpux_readv(p, uap, retval)
 }
 
 int
-hpux_writev(p, uap, retval)
+hpux_writev(p, v, retval)
 	struct proc *p;
-	struct hpux_writev_args *uap;
+	void *v;
 	register_t *retval;
 {
+	struct hpux_writev_args *uap = v;
 	int error;
 
 	error = writev(p, (struct writev_args *) uap, retval);
@@ -634,11 +650,12 @@ hpux_writev(p, uap, retval)
  * and hence allows two arguments.  HP-UX dup has only one arg.
  */
 int
-hpux_dup(p, uap, retval)
+hpux_dup(p, v, retval)
 	struct proc *p;
-	register struct hpux_dup_args *uap;
+	void *v;
 	register_t *retval;
 {
+	register struct hpux_dup_args *uap = v;
 	register struct filedesc *fdp = p->p_fd;
 	struct file *fp;
 	int fd, error;
@@ -658,12 +675,16 @@ hpux_dup(p, uap, retval)
 	return (0);
 }
 
+/*
+ * XXX: This belongs in hpux_machdep.c !!
+ */
 int
-hpux_utssys(p, uap, retval)
+hpux_utssys(p, v, retval)
 	struct proc *p;
-	register struct hpux_utssys_args *uap;
+	void *v;
 	register_t *retval;
 {
+	register struct hpux_utssys_args *uap = v;
 	register int i;
 	int error;
 	struct hpux_utsname	ut;
@@ -754,12 +775,16 @@ hpux_utssys(p, uap, retval)
 	return (error);
 }
 
+/*
+ * XXX: This belongs in hpux_machdep.c !!
+ */
 int
-hpux_sysconf(p, uap, retval)
+hpux_sysconf(p, v, retval)
 	struct proc *p;
-	struct hpux_sysconf_args *uap;
+	void *v;
 	register_t *retval;
 {
+	struct hpux_sysconf_args *uap = v;
 	switch (SCARG(uap, name)) {
 
 	/* clock ticks per second */
@@ -805,29 +830,34 @@ hpux_sysconf(p, uap, retval)
 }
 
 int
-hpux_stat(p, uap, retval)
+hpux_stat(p, v, retval)
 	struct proc *p;
-	struct hpux_stat_args *uap;
+	void *v;
 	register_t *retval;
 {
+	struct hpux_stat_args *uap = v;
+
 	return (hpux_stat1(SCARG(uap, path), SCARG(uap, sb), FOLLOW, p));
 }
 
 int
-hpux_lstat(p, uap, retval)
+hpux_lstat(p, v, retval)
 	struct proc *p;
-	struct hpux_lstat_args *uap;
+	void *v;
 	register_t *retval;
 {
+	struct hpux_lstat_args *uap = v;
+
 	return (hpux_stat1(SCARG(uap, path), SCARG(uap, sb), NOFOLLOW, p));
 }
 
 int
-hpux_fstat(p, uap, retval)
+hpux_fstat(p, v, retval)
 	struct proc *p;
-	register struct hpux_fstat_args *uap;
+	void *v;
 	register_t *retval;
 {
+	register struct hpux_fstat_args *uap = v;
 	register struct filedesc *fdp = p->p_fd;
 	register struct file *fp;
 	struct stat sb;
@@ -858,11 +888,12 @@ hpux_fstat(p, uap, retval)
 }
 
 int
-hpux_ulimit(p, uap, retval)
+hpux_ulimit(p, v, retval)
 	struct proc *p;
-	register struct hpux_ulimit_args *uap;
+	void *v;
 	register_t *retval;
 {
+	register struct hpux_ulimit_args *uap = v;
 	struct rlimit *limp;
 	int error = 0;
 
@@ -897,11 +928,12 @@ hpux_ulimit(p, uap, retval)
  * values -16 (high) thru -1 (low).
  */
 int
-hpux_rtprio(cp, uap, retval)
+hpux_rtprio(cp, v, retval)
 	struct proc *cp;
-	register struct hpux_rtprio_args *uap;
+	void *v;
 	register_t *retval;
 {
+	register struct hpux_rtprio_args *uap = v;
 	struct proc *p;
 	int nice, error;
 
@@ -939,12 +971,16 @@ hpux_rtprio(cp, uap, retval)
 	return (error);
 }
 
+/*
+ * XXX: This belongs in hpux_machdep.c !!
+ */
 int
-hpux_advise(p, uap, retval)
+hpux_advise(p, v, retval)
 	struct proc *p;
-	struct hpux_advise_args *uap;
+	void *v;
 	register_t *retval;
 {
+	struct hpux_advise_args *uap = v;
 	int error = 0;
 
 #ifdef hp300
@@ -967,11 +1003,12 @@ hpux_advise(p, uap, retval)
 }
 
 int
-hpux_ptrace(p, uap, retval)
+hpux_ptrace(p, v, retval)
 	struct proc *p;
-	struct hpux_ptrace_args *uap;
+	void *v;
 	register_t *retval;
 {
+	struct hpux_ptrace_args *uap = v;
 	int error, isps = 0;
 	struct proc *cp;
 
@@ -1043,19 +1080,24 @@ hpux_ptrace(p, uap, retval)
 #include <sys/shm.h>
 
 int
-hpux_shmctl(p, uap, retval)
+hpux_shmctl(p, v, retval)
 	struct proc *p;
-	struct hpux_shmctl_args *uap;
+	void *v;
 	register_t *retval;
 {
+	struct hpux_shmctl_args *uap = v;
+
 	return (hpux_shmctl1(p, (struct hpux_shmctl_args *) uap, retval, 0));
 }
 
 int
-hpux_nshmctl(p, uap, retval)
+hpux_nshmctl(p, v, retval)
 	struct proc *p;
-	struct hpux_nshmctl_args *uap, *retval;
+	void *v;
+	register_t *retval;	/* struct hpux_nshmctl_args * */
 {
+	struct hpux_nshmctl_args *uap = v;
+
 	return (hpux_shmctl1(p, (struct hpux_shmctl_args *) uap, retval, 1));
 }
 
@@ -1138,12 +1180,13 @@ hpux_shmctl1(p, uap, retval, isnew)
  * HP-UX mmap() emulation (mainly for shared library support).
  */
 int
-hpux_mmap(p, uap, retval)
+hpux_mmap(p, v, retval)
 	struct proc *p;
-	struct hpux_mmap_args *uap;
+	void *v;
 	register_t *retval;
 {
-	struct mmap_args {
+	struct hpux_mmap_args *uap = v;
+	struct mmap_args {	/* XXX FIX ME */
 		caddr_t	addr;
 		int	len;
 		int	prot;
@@ -1278,11 +1321,12 @@ hpuxtobsdioctl(com)
  *	the sgttyb struct is 2 bytes longer
  */
 int
-hpux_ioctl(p, uap, retval)
+hpux_ioctl(p, v, retval)
 	struct proc *p;
-	register struct hpux_ioctl_args *uap;
+	void *v;
 	register_t *retval;
 {
+	register struct hpux_ioctl_args *uap = v;
 	register struct filedesc *fdp = p->p_fd;
 	register struct file *fp;
 	register int com, error;
@@ -1417,15 +1461,19 @@ hpux_ioctl(p, uap, retval)
 	return (error);
 }
 
+/*
+ * XXX: This should be in hpux_machdep.c !!
+ */
 /*
  * Man page lies, behaviour here is based on observed behaviour.
  */
 int
-hpux_getcontext(p, uap, retval)
+hpux_getcontext(p, v, retval)
 	struct proc *p;
-	struct hpux_getcontext_args *uap;
+	void *v;
 	register_t *retval;
 {
+	struct hpux_getcontext_args *uap = v;
 	int error = 0;
 	register int len;
 
@@ -1452,11 +1500,12 @@ hpux_getcontext(p, uap, retval)
  * Note we do not check the real uid or "saved" uid.
  */
 int
-hpux_getpgrp2(cp, uap, retval)
+hpux_getpgrp2(cp, v, retval)
 	struct proc *cp;
-	register struct hpux_getpgrp2_args *uap;
+	void *v;
 	register_t *retval;
 {
+	register struct hpux_getpgrp2_args *uap = v;
 	register struct proc *p;
 
 	if (SCARG(uap, pid) == 0)
@@ -1476,11 +1525,13 @@ hpux_getpgrp2(cp, uap, retval)
  * Note we do not check the real uid or "saved" uid or pgrp.
  */
 int
-hpux_setpgrp2(p, uap, retval)
+hpux_setpgrp2(p, v, retval)
 	struct proc *p;
-	struct hpux_setpgrp2_args *uap;
+	void *v;
 	register_t *retval;
 {
+	struct hpux_setpgrp2_args *uap = v;
+
 	/* empirically determined */
 	if (SCARG(uap, pgid) < 0 || SCARG(uap, pgid) >= 30000)
 		return (EINVAL);
@@ -1491,29 +1542,34 @@ hpux_setpgrp2(p, uap, retval)
  * XXX Same as BSD setre[ug]id right now.  Need to consider saved ids.
  */
 int
-hpux_setresuid(p, uap, retval)
+hpux_setresuid(p, v, retval)
 	struct proc *p;
-	struct hpux_setresuid_args *uap;
+	void *v;
 	register_t *retval;
 {
+	struct hpux_setresuid_args *uap = v;
+
 	return (compat_43_setreuid(p, uap, retval));
 }
 
 int
-hpux_setresgid(p, uap, retval)
+hpux_setresgid(p, v, retval)
 	struct proc *p;
-	struct hpux_setresgid_args *uap;
+	void *v;
 	register_t *retval;
 {
+	struct hpux_setresgid_args *uap = v;
+
 	return (compat_43_setregid(p, uap, retval));
 }
 
 int
-hpux_getrlimit(p, uap, retval)
+hpux_getrlimit(p, v, retval)
 	struct proc *p;
-	struct hpux_getrlimit_args *uap;
+	void *v;
 	register_t *retval;
 {
+	struct hpux_getrlimit_args *uap = v;
 	struct compat_43_getrlimit_args ap;
 
 	if (SCARG(uap, which) > HPUXRLIMIT_NOFILE)
@@ -1528,11 +1584,12 @@ hpux_getrlimit(p, uap, retval)
 }
 
 int
-hpux_setrlimit(p, uap, retval)
+hpux_setrlimit(p, v, retval)
 	struct proc *p;
-	struct hpux_setrlimit_args *uap;
+	void *v;
 	register_t *retval;
 {
+	struct hpux_setrlimit_args *uap = v;
 	struct compat_43_setrlimit_args ap;
 
 	if (SCARG(uap, which) > HPUXRLIMIT_NOFILE)
@@ -1550,20 +1607,23 @@ hpux_setrlimit(p, uap, retval)
  * XXX: simple recognition hack to see if we can make grmd work.
  */
 int
-hpux_lockf(p, uap, retval)
+hpux_lockf(p, v, retval)
 	struct proc *p;
-	struct hpux_lockf_args *uap;
+	void *v;
 	register_t *retval;
 {
+	struct hpux_lockf_args *uap = v;
+
 	return (0);
 }
 
 int
-hpux_getaccess(p, uap, retval)
+hpux_getaccess(p, v, retval)
 	register struct proc *p;
-	register struct hpux_getaccess_args *uap;
+	void *v;
 	register_t *retval;
 {
+	register struct hpux_getaccess_args *uap = v;
 	int lgroups[NGROUPS];
 	int error = 0;
 	register struct ucred *cred;
@@ -1658,6 +1718,9 @@ hpux_getaccess(p, uap, retval)
 	return (error);
 }
 
+/*
+ * XXX: This needs to be in hpux_machdep.c !!
+ */
 extern char kstack[];
 #define UOFF(f)		((int)&((struct user *)0)->f)
 #define HPUOFF(f)	((int)&((struct hpux_user *)0)->f)
@@ -1849,11 +1912,13 @@ hpux_dumpu(vp, cred)
  * SYS V style setpgrp()
  */
 int
-compat_hpux_6x_setpgrp(p, uap, retval)
+compat_hpux_6x_setpgrp(p, v, retval)
 	register struct proc *p;
-	struct compat_hpux_6x_setpgrp_args *uap;
+	void *v;
 	register_t *retval;
 {
+	struct compat_hpux_6x_setpgrp_args *uap = v;
+
 	if (p->p_pid != p->p_pgid)
 		enterpgrp(p, p->p_pid, 0);
 	*retval = p->p_pgid;
@@ -1861,11 +1926,13 @@ compat_hpux_6x_setpgrp(p, uap, retval)
 }
 
 int
-compat_hpux_6x_time(p, uap, retval)
+compat_hpux_6x_time(p, v, retval)
 	struct proc *p;
-	register struct compat_hpux_6x_time_args *uap;
+	void *v;
 	register_t *retval;
 {
+	register struct compat_hpux_6x_time_args *uap = v;
+
 	int error = 0;
 	struct timeval tv;
 
@@ -1879,11 +1946,12 @@ compat_hpux_6x_time(p, uap, retval)
 }
 
 int
-compat_hpux_6x_stime(p, uap, retval)
+compat_hpux_6x_stime(p, v, retval)
 	struct proc *p;
-	register struct compat_hpux_6x_stime_args *uap;
+	void *v;
 	register_t *retval;
 {
+	register struct compat_hpux_6x_stime_args *uap = v;
 	struct timeval tv;
 	int s, error;
 
@@ -1900,11 +1968,12 @@ compat_hpux_6x_stime(p, uap, retval)
 }
 
 int
-compat_hpux_6x_ftime(p, uap, retval)
+compat_hpux_6x_ftime(p, v, retval)
 	struct proc *p;
-	register struct compat_hpux_6x_ftime_args *uap;
+	void *v;
 	register_t *retval;
 {
+	register struct compat_hpux_6x_ftime_args *uap = v;
 	struct hpux_otimeb tb;
 	int s;
 
@@ -1918,11 +1987,12 @@ compat_hpux_6x_ftime(p, uap, retval)
 }
 
 int
-compat_hpux_6x_alarm(p, uap, retval)
+compat_hpux_6x_alarm(p, v, retval)
 	register struct proc *p;
-	register struct compat_hpux_6x_alarm_args *uap;
+	void *v;
 	register_t *retval;
 {
+	register struct compat_hpux_6x_alarm_args *uap = v;
 	int s = splhigh();
 
 	untimeout(realitexpire, (caddr_t)p);
@@ -1944,11 +2014,12 @@ compat_hpux_6x_alarm(p, uap, retval)
 }
 
 int
-compat_hpux_6x_nice(p, uap, retval)
+compat_hpux_6x_nice(p, v, retval)
 	register struct proc *p;
-	register struct compat_hpux_6x_nice_args *uap;
+	void *v;
 	register_t *retval;
 {
+	register struct compat_hpux_6x_nice_args *uap = v;
 	int error;
 
 	error = donice(p, p, (p->p_nice-NZERO)+SCARG(uap, nval));
@@ -1958,11 +2029,12 @@ compat_hpux_6x_nice(p, uap, retval)
 }
 
 int
-compat_hpux_6x_times(p, uap, retval)
+compat_hpux_6x_times(p, v, retval)
 	struct proc *p;
-	register struct compat_hpux_6x_times_args *uap;
+	void *v;
 	register_t *retval;
 {
+	register struct compat_hpux_6x_times_args *uap = v;
 	struct timeval ru, rs;
 	struct tms atms;
 	int error;
@@ -1996,11 +2068,12 @@ hpux_scale(tvp)
  * Can't set ICHG.
  */
 int
-compat_hpux_6x_utime(p, uap, retval)
+compat_hpux_6x_utime(p, v, retval)
 	struct proc *p;
-	register struct compat_hpux_6x_utime_args *uap;
+	void *v;
 	register_t *retval;
 {
+	register struct compat_hpux_6x_utime_args *uap = v;
 	register struct vnode *vp;
 	struct vattr vattr;
 	time_t tv[2];
@@ -2033,11 +2106,13 @@ compat_hpux_6x_utime(p, uap, retval)
 }
 
 int
-compat_hpux_6x_pause(p, uap, retval)
+compat_hpux_6x_pause(p, v, retval)
 	struct proc *p;
-	struct compat_hpux_6x_pause_args *uap;
+	void *v;
 	register_t *retval;
 {
+	struct compat_hpux_6x_pause_args *uap = v;
+
 	(void) tsleep(kstack, PPAUSE | PCATCH, "pause", 0);
 	/* always return EINTR rather than ERESTART... */
 	return (EINTR);
@@ -2047,11 +2122,12 @@ compat_hpux_6x_pause(p, uap, retval)
  * The old fstat system call.
  */
 int
-compat_hpux_6x_fstat(p, uap, retval)
+compat_hpux_6x_fstat(p, v, retval)
 	struct proc *p;
-	register struct compat_hpux_6x_fstat_args *uap;
+	void *v;
 	register_t *retval;
 {
+	register struct compat_hpux_6x_fstat_args *uap = v;
 	register struct filedesc *fdp = p->p_fd;
 	struct file *fp;
 
@@ -2068,11 +2144,12 @@ compat_hpux_6x_fstat(p, uap, retval)
  * Old stat system call.  This version follows links.
  */
 int
-compat_hpux_6x_stat(p, uap, retval)
+compat_hpux_6x_stat(p, v, retval)
 	struct proc *p;
-	register struct compat_hpux_6x_stat_args *uap;
+	void *v;
 	register_t *retval;
 {
+	register struct compat_hpux_6x_stat_args *uap = v;
 	int error;
 	struct nameidata nd;
 
diff --git a/sys/compat/hpux/hpux_net.c b/sys/compat/hpux/hpux_net.c
index 2972877a77d2..49b981dbc978 100644
--- a/sys/compat/hpux/hpux_net.c
+++ b/sys/compat/hpux/hpux_net.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: hpux_net.c,v 1.10 1995/05/10 16:45:34 christos Exp $	*/
+/*	$NetBSD: hpux_net.c,v 1.11 1995/09/19 22:53:49 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -73,10 +73,6 @@
  * HPUX netioctl() to BSD syscall map.
  * Indexed by callno - MINBSDIPCCODE
  */
-extern int socket(), listen(), bind(), compat_43_accept(), connect(), compat_43_recv();
-extern int compat_43_send(), shutdown(), compat_43_getsockname(), sendto();
-extern int compat_43_recvfrom(), compat_43_getpeername();
-int hpux_getsockopt(), hpux_setsockopt();
 
 struct hpuxtobsdipc {
 	int (*rout)();
@@ -121,11 +117,12 @@ struct hpuxtobsdipc {
  * Gleened from disassembled libbsdipc.a syscall entries.
  */
 int
-hpux_netioctl(p, uap, retval)
+hpux_netioctl(p, v, retval)
 	struct proc *p;
-	struct hpux_netioctl_args *uap;
+	void *v;
 	register_t *retval;
 {
+	struct hpux_netioctl_args *uap = v;
 	int *args, i;
 	register int code;
 	int error;
@@ -190,11 +187,12 @@ struct hpux_setsockopt_args {
 };
 
 /* ARGSUSED */
-hpux_setsockopt(p, uap, retval)
+hpux_setsockopt(p, v, retval)
 	struct proc *p;
-	struct hpux_setsockopt_args *uap;
+	void *v;
 	register_t *retval;
 {
+	struct hpux_setsockopt_args *uap = v;
 	struct file *fp;
 	struct mbuf *m = NULL;
 	int tmp, error;
@@ -233,11 +231,12 @@ hpux_setsockopt(p, uap, retval)
 
 /* ARGSUSED */
 int
-hpux_setsockopt2(p, uap, retval)
+hpux_setsockopt2(p, v, retval)
 	struct proc *p;
-	register struct hpux_setsockopt2_args *uap;
+	void *v;
 	register_t *retval;
 {
+	register struct hpux_setsockopt2_args *uap = v;
 	struct file *fp;
 	struct mbuf *m = NULL;
 	int error;
@@ -270,11 +269,12 @@ struct hpux_getsockopt_args {
 };
 
 int
-hpux_getsockopt(p, uap, retval)
+hpux_getsockopt(p, v, retval)
 	struct proc *p;
-	struct hpux_getsockopt_args *uap;
+	void *v;
 	register_t *retval;
 {
+	struct hpux_getsockopt_args *uap = v;
 	struct file *fp;
 	struct mbuf *m = NULL;
 	int valsize, error;
diff --git a/sys/compat/hpux/hpux_sig.c b/sys/compat/hpux/hpux_sig.c
index 8904afd7e326..9c80073e591d 100644
--- a/sys/compat/hpux/hpux_sig.c
+++ b/sys/compat/hpux/hpux_sig.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: hpux_sig.c,v 1.12 1995/05/10 16:45:35 christos Exp $	*/
+/*	$NetBSD: hpux_sig.c,v 1.13 1995/09/19 22:53:50 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -81,11 +81,12 @@ char bsdtohpuxsigmap[NSIG] = {
  * doubt any program of interest mixes the two semantics.
  */
 int
-hpux_sigvec(p, uap, retval)
+hpux_sigvec(p, v, retval)
 	struct proc *p;
-	register struct hpux_sigvec_args *uap;
+	void *v;
 	register_t *retval;
 {
+	register struct hpux_sigvec_args *uap = v;
 	struct sigvec vec;
 	register struct sigacts *ps = p->p_sigacts;
 	register struct sigvec *sv;
@@ -134,11 +135,12 @@ hpux_sigvec(p, uap, retval)
 }
 
 int
-hpux_sigblock(p, uap, retval)
+hpux_sigblock(p, v, retval)
 	register struct proc *p;
-	struct hpux_sigblock_args *uap;
+	void *v;
 	register_t *retval;
 {
+	struct hpux_sigblock_args *uap = v;
 
 	(void) splhigh();
 	*retval = bsdtohpuxmask(p->p_sigmask);
@@ -148,11 +150,12 @@ hpux_sigblock(p, uap, retval)
 }
 
 int
-hpux_sigsetmask(p, uap, retval)
+hpux_sigsetmask(p, v, retval)
 	struct proc *p;
-	struct hpux_sigsetmask_args *uap;
+	void *v;
 	register_t *retval;
 {
+	struct hpux_sigsetmask_args *uap = v;
 
 	(void) splhigh();
 	*retval = bsdtohpuxmask(p->p_sigmask);
@@ -162,11 +165,12 @@ hpux_sigsetmask(p, uap, retval)
 }
 
 int
-hpux_sigpause(p, uap, retval)
+hpux_sigpause(p, v, retval)
 	struct proc *p;
-	struct hpux_sigpause_args *uap;
+	void *v;
 	register_t *retval;
 {
+	struct hpux_sigpause_args *uap = v;
 
 	SCARG(uap, mask) = hpuxtobsdmask(SCARG(uap, mask));
 	return (sigsuspend(p, uap, retval));
@@ -174,11 +178,12 @@ hpux_sigpause(p, uap, retval)
 
 /* not totally correct, but close enuf' */
 int
-hpux_kill(p, uap, retval)
+hpux_kill(p, v, retval)
 	struct proc *p;
-	struct hpux_kill_args *uap;
+	void *v;
 	register_t *retval;
 {
+	struct hpux_kill_args *uap = v;
 
 	if (SCARG(uap, signo)) {
 		SCARG(uap, signo) = hpuxtobsdsig(SCARG(uap, signo));
@@ -201,11 +206,12 @@ hpux_kill(p, uap, retval)
  * the library stub does the rest.
  */
 int
-hpux_sigprocmask(p, uap, retval)
+hpux_sigprocmask(p, v, retval)
 	register struct proc *p;
-	struct hpux_sigprocmask_args *uap;
+	void *v;
 	register_t *retval;
 {
+	struct hpux_sigprocmask_args *uap = v;
 	int mask, error = 0;
 	hpux_sigset_t sigset;
 
@@ -246,11 +252,12 @@ hpux_sigprocmask(p, uap, retval)
 }
 
 int
-hpux_sigpending(p, uap, retval)
+hpux_sigpending(p, v, retval)
 	register struct proc *p;
-	struct hpux_sigpending_args *uap;
+	void *v;
 	register_t *retval;
 {
+	struct hpux_sigpending_args *uap = v;
 	hpux_sigset_t sigset;
 
 	sigset.sigset[0] = bsdtohpuxmask(p->p_siglist);
@@ -259,11 +266,12 @@ hpux_sigpending(p, uap, retval)
 }
 
 int
-hpux_sigsuspend(p, uap, retval)
+hpux_sigsuspend(p, v, retval)
 	register struct proc *p;
-	struct hpux_sigsuspend_args *uap;
+	void *v;
 	register_t *retval;
 {
+	struct hpux_sigsuspend_args *uap = v;
 	register struct sigacts *ps = p->p_sigacts;
 	hpux_sigset_t sigset;
 	int mask;
@@ -280,11 +288,12 @@ hpux_sigsuspend(p, uap, retval)
 }
 
 int
-hpux_sigaction(p, uap, retval)
+hpux_sigaction(p, v, retval)
 	struct proc *p;
-	register struct hpux_sigaction_args *uap;
+	void *v;
 	register_t *retval;
 {
+	register struct hpux_sigaction_args *uap = v;
 	struct hpux_sigaction action;
 	register struct sigacts *ps = p->p_sigacts;
 	register struct hpux_sigaction *sa;
@@ -345,11 +354,12 @@ hpux_sigaction(p, uap, retval)
 
 #ifdef COMPAT_HPUX_6X
 int
-compat_hpux_6x_ssig(p, uap, retval)
+compat_hpux_6x_ssig(p, v, retval)
 	struct proc *p;
-	struct compat_hpux_6x_ssig_args *uap;
+	void *v;
 	register_t *retval;
 {
+	struct compat_hpux_6x_ssig_args *uap = v;
 	register int a;
 	struct sigaction vec;
 	register struct sigaction *sa = &vec;
diff --git a/sys/compat/hpux/hpux_tty.c b/sys/compat/hpux/hpux_tty.c
index 077cee31eb49..06ac2f932307 100644
--- a/sys/compat/hpux/hpux_tty.c
+++ b/sys/compat/hpux/hpux_tty.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: hpux_tty.c,v 1.9 1995/05/10 16:45:43 christos Exp $	*/
+/*	$NetBSD: hpux_tty.c,v 1.10 1995/09/19 22:53:51 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -472,20 +472,24 @@ hpuxtobsdbaud(hpux_speed)
 #ifdef COMPAT_HPUX_6X
 
 int
-compat_hpux_6x_gtty(p, uap, retval)
+compat_hpux_6x_gtty(p, v, retval)
 	struct proc *p;
-	struct compat_hpux_6x_gtty_args *uap;
+	void *v;
 	register_t *retval;
 {
+	struct compat_hpux_6x_gtty_args *uap = v;
+
 	return (getsettty(p, SCARG(uap, fd), HPUXTIOCGETP, SCARG(uap, arg)));
 }
 
 int
-compat_hpux_6x_stty(p, uap, retval)
+compat_hpux_6x_stty(p, v, retval)
 	struct proc *p;
-	struct compat_hpux_6x_stty_args *uap;
+	void *v;
 	register_t *retval;
 {
+	struct compat_hpux_6x_stty_args *uap = v;
+
 	return (getsettty(p, SCARG(uap, fd), HPUXTIOCSETP, SCARG(uap, arg)));
 }
 
diff --git a/sys/compat/linux/arch/i386/linux_machdep.c b/sys/compat/linux/arch/i386/linux_machdep.c
index 61a6af2fc24e..14fc6554e34d 100644
--- a/sys/compat/linux/arch/i386/linux_machdep.c
+++ b/sys/compat/linux/arch/i386/linux_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: linux_machdep.c,v 1.18 1995/09/08 07:57:15 fvdl Exp $	*/
+/*	$NetBSD: linux_machdep.c,v 1.19 1995/09/19 22:56:37 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1995 Frank van der Linden
@@ -191,13 +191,14 @@ linux_sendsig(catcher, sig, mask, code)
  * a machine fault.
  */
 int
-linux_sigreturn(p, uap, retval)
+linux_sigreturn(p, v, retval)
 	struct proc *p;
-	struct linux_sigreturn_args /* {
-		syscallarg(struct linux_sigcontext *) scp;
-	} */ *uap;
+	void *v;
 	register_t *retval;
 {
+	struct linux_sigreturn_args /* {
+		syscallarg(struct linux_sigcontext *) scp;
+	} */ *uap = v;
 	struct linux_sigcontext *scp, context;
 	register struct trapframe *tf;
 
@@ -363,15 +364,16 @@ linux_write_ldt(p, uap, retval)
 #endif /* USER_LDT */
 
 int
-linux_modify_ldt(p, uap, retval)
+linux_modify_ldt(p, v, retval)
 	struct proc *p;
+	void *v;
+	register_t *retval;
+{
 	struct linux_modify_ldt_args /* {
 		syscallarg(int) func;
 		syscallarg(void *) ptr;
 		syscallarg(size_t) bytecount;
-	} */ *uap;
-	register_t *retval;
-{
+	} */ *uap = v;
 
 	switch (SCARG(uap, func)) {
 #ifdef USER_LDT
@@ -406,15 +408,16 @@ linux_fakedev(dev)
  * We come here in a last attempt to satisfy a Linux ioctl() call
  */
 int
-linux_machdepioctl(p, uap, retval)
+linux_machdepioctl(p, v, retval)
 	struct proc *p;
+	void *v;
+	register_t *retval;
+{
 	struct linux_ioctl_args /* {
 		syscallarg(int) fd;
 		syscallarg(u_long) com;
 		syscallarg(caddr_t) data;
-	} */ *uap;
-	register_t *retval;
-{
+	} */ *uap = v;
 	struct ioctl_args bia, tmparg;
 	u_long com;
 #if NVT > 0
@@ -514,13 +517,14 @@ linux_machdepioctl(p, uap, retval)
  * to rely on I/O permission maps, which are not implemented.
  */
 int
-linux_iopl(p, uap, retval)
+linux_iopl(p, v, retval)
 	struct proc *p;
-	struct linux_iopl_args /* {
-		syscallarg(int) level;
-	} */ *uap;
+	void *v;
 	register_t *retval;
 {
+	struct linux_iopl_args /* {
+		syscallarg(int) level;
+	} */ *uap = v;
 	struct trapframe *fp = p->p_md.md_regs;
 
 	if (suser(p->p_ucred, &p->p_acflag) != 0)
@@ -535,15 +539,16 @@ linux_iopl(p, uap, retval)
  * just let it have the whole range.
  */
 int
-linux_ioperm(p, uap, retval)
+linux_ioperm(p, v, retval)
 	struct proc *p;
+	void *v;
+	register_t *retval;
+{
 	struct linux_ioperm_args /* {
 		syscallarg(unsigned int) lo;
 		syscallarg(unsigned int) hi;
 		syscallarg(int) val;
-	} */ *uap;
-	register_t *retval;
-{
+	} */ *uap = v;
 	struct trapframe *fp = p->p_md.md_regs;
 
 	if (suser(p->p_ucred, &p->p_acflag) != 0)
diff --git a/sys/compat/linux/i386/linux_machdep.c b/sys/compat/linux/i386/linux_machdep.c
index 61a6af2fc24e..14fc6554e34d 100644
--- a/sys/compat/linux/i386/linux_machdep.c
+++ b/sys/compat/linux/i386/linux_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: linux_machdep.c,v 1.18 1995/09/08 07:57:15 fvdl Exp $	*/
+/*	$NetBSD: linux_machdep.c,v 1.19 1995/09/19 22:56:37 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1995 Frank van der Linden
@@ -191,13 +191,14 @@ linux_sendsig(catcher, sig, mask, code)
  * a machine fault.
  */
 int
-linux_sigreturn(p, uap, retval)
+linux_sigreturn(p, v, retval)
 	struct proc *p;
-	struct linux_sigreturn_args /* {
-		syscallarg(struct linux_sigcontext *) scp;
-	} */ *uap;
+	void *v;
 	register_t *retval;
 {
+	struct linux_sigreturn_args /* {
+		syscallarg(struct linux_sigcontext *) scp;
+	} */ *uap = v;
 	struct linux_sigcontext *scp, context;
 	register struct trapframe *tf;
 
@@ -363,15 +364,16 @@ linux_write_ldt(p, uap, retval)
 #endif /* USER_LDT */
 
 int
-linux_modify_ldt(p, uap, retval)
+linux_modify_ldt(p, v, retval)
 	struct proc *p;
+	void *v;
+	register_t *retval;
+{
 	struct linux_modify_ldt_args /* {
 		syscallarg(int) func;
 		syscallarg(void *) ptr;
 		syscallarg(size_t) bytecount;
-	} */ *uap;
-	register_t *retval;
-{
+	} */ *uap = v;
 
 	switch (SCARG(uap, func)) {
 #ifdef USER_LDT
@@ -406,15 +408,16 @@ linux_fakedev(dev)
  * We come here in a last attempt to satisfy a Linux ioctl() call
  */
 int
-linux_machdepioctl(p, uap, retval)
+linux_machdepioctl(p, v, retval)
 	struct proc *p;
+	void *v;
+	register_t *retval;
+{
 	struct linux_ioctl_args /* {
 		syscallarg(int) fd;
 		syscallarg(u_long) com;
 		syscallarg(caddr_t) data;
-	} */ *uap;
-	register_t *retval;
-{
+	} */ *uap = v;
 	struct ioctl_args bia, tmparg;
 	u_long com;
 #if NVT > 0
@@ -514,13 +517,14 @@ linux_machdepioctl(p, uap, retval)
  * to rely on I/O permission maps, which are not implemented.
  */
 int
-linux_iopl(p, uap, retval)
+linux_iopl(p, v, retval)
 	struct proc *p;
-	struct linux_iopl_args /* {
-		syscallarg(int) level;
-	} */ *uap;
+	void *v;
 	register_t *retval;
 {
+	struct linux_iopl_args /* {
+		syscallarg(int) level;
+	} */ *uap = v;
 	struct trapframe *fp = p->p_md.md_regs;
 
 	if (suser(p->p_ucred, &p->p_acflag) != 0)
@@ -535,15 +539,16 @@ linux_iopl(p, uap, retval)
  * just let it have the whole range.
  */
 int
-linux_ioperm(p, uap, retval)
+linux_ioperm(p, v, retval)
 	struct proc *p;
+	void *v;
+	register_t *retval;
+{
 	struct linux_ioperm_args /* {
 		syscallarg(unsigned int) lo;
 		syscallarg(unsigned int) hi;
 		syscallarg(int) val;
-	} */ *uap;
-	register_t *retval;
-{
+	} */ *uap = v;
 	struct trapframe *fp = p->p_md.md_regs;
 
 	if (suser(p->p_ucred, &p->p_acflag) != 0)