From 9e97623a5c66430f981806fd1d26cb0db8a30c93 Mon Sep 17 00:00:00 2001
From: Chris Torek <torek@ucbvax.Berkeley.EDU>
Date: Sat, 11 Jul 1992 04:04:51 -0800
Subject: [PATCH] ANSIfy syscall args

SCCS-vsn: sys/kern/vfs_syscalls.c 7.93
SCCS-vsn: sys/hp/hpux/hpux_compat.c 7.27
SCCS-vsn: sys/nfs/nfs_syscalls.c 7.32
SCCS-vsn: sys/kern/kern_acct.c 7.25
SCCS-vsn: sys/kern/kern_descrip.c 7.37
SCCS-vsn: sys/kern/kern_exec.c 7.65
SCCS-vsn: sys/kern/kern_exit.c 7.48
SCCS-vsn: sys/kern/kern_fork.c 7.38
SCCS-vsn: sys/kern/kern_sysctl.c 7.24
SCCS-vsn: sys/kern/kern_ktrace.c 7.20
SCCS-vsn: sys/kern/kern_prot.c 7.25
SCCS-vsn: sys/kern/kern_resource.c 7.21
SCCS-vsn: sys/kern/kern_sig.c 7.50
SCCS-vsn: sys/kern/kern_time.c 7.18
SCCS-vsn: sys/kern/kern_xxx.c 7.19
SCCS-vsn: sys/kern/subr_prof.c 7.17
---
 usr/src/sys/hp/hpux/hpux_compat.c | 409 ++++++++++++++++-------------
 usr/src/sys/kern/kern_acct.c      |   9 +-
 usr/src/sys/kern/kern_descrip.c   |   2 +-
 usr/src/sys/kern/kern_exec.c      |  13 +-
 usr/src/sys/kern/kern_exit.c      |  51 ++--
 usr/src/sys/kern/kern_fork.c      |   9 +-
 usr/src/sys/kern/kern_ktrace.c    |  15 +-
 usr/src/sys/kern/kern_prot.c      |  93 ++++---
 usr/src/sys/kern/kern_resource.c  |   2 +-
 usr/src/sys/kern/kern_sig.c       | 100 ++++---
 usr/src/sys/kern/kern_sysctl.c    |  15 +-
 usr/src/sys/kern/kern_time.c      |  47 ++--
 usr/src/sys/kern/kern_xxx.c       |  43 ++--
 usr/src/sys/kern/subr_prof.c      |  15 +-
 usr/src/sys/kern/vfs_syscalls.c   | 415 ++++++++++++++++--------------
 usr/src/sys/nfs/nfs_syscalls.c    |  20 +-
 16 files changed, 691 insertions(+), 567 deletions(-)

diff --git a/usr/src/sys/hp/hpux/hpux_compat.c b/usr/src/sys/hp/hpux/hpux_compat.c
index 28951386fc..fb45647b87 100644
--- a/usr/src/sys/hp/hpux/hpux_compat.c
+++ b/usr/src/sys/hp/hpux/hpux_compat.c
@@ -120,13 +120,14 @@ notimp(p, uap, retval, code, nargs)
 	return (error);
 }
 
+struct hpuxexecv_args {
+	char	*fname;
+	char	**argp;
+	char	**envp;
+};
 hpuxexecv(p, uap, retval)
 	struct proc *p;
-	struct args {
-		char	*fname;
-		char	**argp;
-		char	**envp;
-	} *uap;
+	struct hpuxexecv_args *uap;
 	int *retval;
 {
 	extern int execve();
@@ -141,13 +142,14 @@ hpuxexecv(p, uap, retval)
  * handling it in the C library stub.  We also need to map any
  * termination signal from BSD to HP-UX.
  */
+struct hpuxwait3_args {
+	int	*status;
+	int	options;
+	int	rusage;
+};
 hpuxwait3(p, uap, retval)
 	struct proc *p;
-	struct args {
-		int	*status;
-		int	options;
-		int	rusage;
-	} *uap;
+	struct hpuxwait3_args *uap;
 	int *retval;
 {
 	/* rusage pointer must be zero */
@@ -159,11 +161,12 @@ hpuxwait3(p, uap, retval)
 	return (hpuxwait(p, uap, retval));
 }
 
+struct hpuxwait_args {
+	int	*status;
+};
 hpuxwait(p, uap, retval)
 	struct proc *p;
-	struct args {
-		int	*status;
-	} *uap;
+	struct hpuxwait_args *uap;
 	int *retval;
 {
 	int sig, *statp, error;
@@ -191,14 +194,15 @@ hpuxwait(p, uap, retval)
 	return (error);
 }
 
+struct hpuxwaitpid_args {
+	int	pid;
+	int	*status;
+	int	options;
+	struct	rusage *rusage;	/* wait4 arg */
+};
 hpuxwaitpid(p, uap, retval)
 	struct proc *p;
-	struct args {
-		int	pid;
-		int	*status;
-		int	options;
-		struct	rusage *rusage;	/* wait4 arg */
-	} *uap;
+	struct hpuxwaitpid_args *uap;
 	int *retval;
 {
 	int sig, *statp, error;
@@ -231,13 +235,14 @@ hpuxwaitpid(p, uap, retval)
  * O_CREAT, O_TRUNC, and O_EXCL must be remapped,
  * O_SYNCIO (0100000) is removed entirely.
  */
+struct hpuxopen_args {
+	char	*fname;
+	int	mode;
+	int	crtmode;
+};
 hpuxopen(p, uap, retval)
 	struct proc *p;
-	register struct args {
-		char	*fname;
-		int	mode;
-		int	crtmode;
-	} *uap;
+	register struct hpuxopen_args *uap;
 	int *retval;
 {
 	int mode;
@@ -266,13 +271,14 @@ hpuxopen(p, uap, retval)
 #define	UF_FIONBIO_ON	0x40
 /* XXX */
 
+struct hpuxfcntl_args {
+	int	fdes;
+	int	cmd;
+	int	arg;
+};
 hpuxfcntl(p, uap, retval)
 	struct proc *p;
-	register struct args {
-		int	fdes;
-		int	cmd;
-		int	arg;
-	} *uap;
+	register struct hpuxfcntl_args *uap;
 	int *retval;
 {
 	int mode, error;
@@ -326,11 +332,12 @@ hpuxfcntl(p, uap, retval)
  * In 6.2 and 6.5 sockets appear to return EWOULDBLOCK.
  * In 7.0 the behavior for sockets depends on whether FNONBLOCK is in effect.
  */
+struct hpuxread_args {
+	int	fd;
+};
 hpuxread(p, uap, retval)
 	struct proc *p;
-	struct args {
-		int	fd;
-	} *uap;
+	struct hpuxread_args *uap;
 	int *retval;
 {
 	int error;
@@ -345,11 +352,12 @@ hpuxread(p, uap, retval)
 	return (error);
 }
 
+struct hpuxwrite_args {
+	int	fd;
+};
 hpuxwrite(p, uap, retval)
 	struct proc *p;
-	struct args {
-		int	fd;
-	} *uap;
+	struct hpuxwrite_args *uap;
 	int *retval;
 {
 	int error;
@@ -364,11 +372,12 @@ hpuxwrite(p, uap, retval)
 	return (error);
 }
 
+struct hpuxreadv_args {
+	int	fd;
+};
 hpuxreadv(p, uap, retval)
 	struct proc *p;
-	struct args {
-		int	fd;
-	} *uap;
+	struct hpuxreadv_args *uap;
 	int *retval;
 {
 	int error;
@@ -383,11 +392,12 @@ hpuxreadv(p, uap, retval)
 	return (error);
 }
 
+struct hpuxwritev_args {
+	int	fd;
+};
 hpuxwritev(p, uap, retval)
 	struct proc *p;
-	struct args {
-		int	fd;
-	} *uap;
+	struct hpuxwritev_args *uap;
 	int *retval;
 {
 	int error;
@@ -406,11 +416,12 @@ hpuxwritev(p, uap, retval)
  * 4.3bsd dup allows dup2 to come in on the same syscall entry
  * and hence allows two arguments.  HP-UX dup has only one arg.
  */
+struct hpuxdup_args {
+	int	i;
+};
 hpuxdup(p, uap, retval)
 	struct proc *p;
-	register struct args {
-		int	i;
-	} *uap;
+	register struct hpuxdup_args *uap;
 	int *retval;
 {
 	register struct filedesc *fdp = p->p_fd;
@@ -431,13 +442,14 @@ hpuxdup(p, uap, retval)
 	return (0);
 }
 
+struct hpuxutssys_args {
+	struct hpuxutsname *uts;
+	int dev;
+	int request;
+};
 hpuxutssys(p, uap, retval)
 	struct proc *p;
-	register struct args {
-		struct hpuxutsname *uts;
-		int dev;
-		int request;
-	} *uap;
+	register struct hpuxutssys_args *uap;
 	int *retval;
 {
 	register int i;
@@ -505,11 +517,12 @@ hpuxutssys(p, uap, retval)
 	return (error);
 }
 
+struct hpuxsysconf_args {
+	int	name;
+};
 hpuxsysconf(p, uap, retval)
 	struct proc *p;
-	struct args {
-		int	name;
-	} *uap;
+	struct hpuxsysconf_args *uap;
 	int *retval;
 {
 	switch (uap->name) {
@@ -545,34 +558,37 @@ hpuxsysconf(p, uap, retval)
 	return (0);
 }
 
+struct hpuxstat_args {
+	char	*fname;
+	struct hpuxstat *hsb;
+};
 hpuxstat(p, uap, retval)
 	struct proc *p;
-	struct args {
-		char	*fname;
-		struct hpuxstat *hsb;
-	} *uap;
+	struct hpuxstat_args *uap;
 	int *retval;
 {
 	return (hpuxstat1(uap->fname, uap->hsb, FOLLOW));
 }
 
+struct hpuxlstat_args {
+	char	*fname;
+	struct hpuxstat *hsb;
+};
 hpuxlstat(p, uap, retval)
 	struct proc *p;
-	struct args {
-		char	*fname;
-		struct hpuxstat *hsb;
-	} *uap;
+	struct hpuxlstat_args *uap;
 	int *retval;
 {
 	return (hpuxstat1(uap->fname, uap->hsb, NOFOLLOW));
 }
 
+struct hpuxfstat_args {
+	int	fdes;
+	struct	hpuxstat *hsb;
+};
 hpuxfstat(p, uap, retval)
 	struct proc *p;
-	register struct args {
-		int	fdes;
-		struct	hpuxstat *hsb;
-	} *uap;
+	register struct hpuxfstat_args *uap;
 	int *retval;
 {
 	register struct filedesc *fdp = p->p_fd;
@@ -604,12 +620,13 @@ hpuxfstat(p, uap, retval)
 	return (error);
 }
 
+struct hpuxulimit_args {
+	int	cmd;
+	long	newlimit;
+};
 hpuxulimit(p, uap, retval)
 	struct proc *p;
-	register struct args {
-		int	cmd;
-		long	newlimit;
-	} *uap;
+	register struct hpuxulimit_args *uap;
 	long *retval;
 {
 	struct rlimit *limp;
@@ -645,12 +662,13 @@ hpuxulimit(p, uap, retval)
  * Map "real time" priorities 0 (high) thru 127 (low) into nice
  * values -16 (high) thru -1 (low).
  */
+struct hpuxrtprio_args {
+	int pid;
+	int prio;
+};
 hpuxrtprio(cp, uap, retval)
 	struct proc *cp;
-	register struct args {
-		int pid;
-		int prio;
-	} *uap;
+	register struct hpuxrtprio_args *uap;
 	int *retval;
 {
 	struct proc *p;
@@ -689,11 +707,12 @@ hpuxrtprio(cp, uap, retval)
 	return (error);
 }
 
+struct hpuxadvise_args {
+	int	arg;
+};
 hpuxadvise(p, uap, retval)
 	struct proc *p;
-	struct args {
-		int	arg;
-	} *uap;
+	struct hpuxadvise_args *uap;
 	int *retval;
 {
 	int error = 0;
@@ -715,14 +734,15 @@ hpuxadvise(p, uap, retval)
 	return (error);
 }
 
+struct hpuxptrace_args {
+	int	req;
+	int	pid;
+	int	*addr;
+	int	data;
+};
 hpuxptrace(p, uap, retval)
 	struct proc *p;
-	struct args {
-		int	req;
-		int	pid;
-		int	*addr;
-		int	data;
-	} *uap;
+	struct hpuxptrace_args *uap;
 	int *retval;
 {
 	int error;
@@ -738,12 +758,13 @@ hpuxptrace(p, uap, retval)
 	return (error);
 }
 
+struct hpuxgetdomainname_args {
+	char	*domainname;
+	u_int	len;
+};
 hpuxgetdomainname(p, uap, retval)
 	struct proc *p;
-	register struct args {
-		char	*domainname;
-		u_int	len;
-	} *uap;
+	register struct hpuxgetdomainname_args *uap;
 	int *retval;
 {
 	if (uap->len > domainnamelen + 1)
@@ -751,12 +772,13 @@ hpuxgetdomainname(p, uap, retval)
 	return (copyout(domainname, uap->domainname, uap->len));
 }
 
+struct hpuxsetdomainname_args {
+	char	*domainname;
+	u_int	len;
+};
 hpuxsetdomainname(p, uap, retval)
 	struct proc *p;
-	register struct args {
-		char	*domainname;
-		u_int	len;
-	} *uap;
+	register struct hpuxsetdomainname_args *uap;
 	int *retval;
 {
 	int error;
@@ -798,13 +820,14 @@ hpuxshmget(p, uap, retval)
 /*
  * Handle HP-UX specific commands.
  */
+struct hpuxshmctl_args {
+	int shmid;
+	int cmd;
+	caddr_t buf;
+};
 hpuxshmctl(p, uap, retval)
 	struct proc *p;
-	struct args {
-		int shmid;
-		int cmd;
-		caddr_t buf;
-	} *uap;
+	struct hpuxshmctl_args *uap;
 	int *retval;
 {
 	register struct shmid_ds *shp;
@@ -829,40 +852,43 @@ hpuxshmctl(p, uap, retval)
  * Fake semaphore routines, just don't return an error.
  * Should be adequate for starbase to run.
  */
+struct hpuxsemctl_args {
+	int semid;
+	u_int semnum;
+	int cmd;
+	int arg;
+};
 hpuxsemctl(p, uap, retval)
 	struct proc *p;
-	struct args {
-		int semid;
-		u_int semnum;
-		int cmd;
-		int arg;
-	} *uap;
+	struct hpuxsemctl_args *uap;
 	int *retval;
 {
 	/* XXX: should do something here */
 	return (0);
 }
 
+struct hpuxsemget_args {
+	key_t key;
+	int nsems;
+	int semflg;
+};
 hpuxsemget(p, uap, retval)
 	struct proc *p;
-	struct args {
-		key_t key;
-		int nsems;
-		int semflg;
-	} *uap;
+	struct hpuxsemget_args *uap;
 	int *retval;
 {
 	/* XXX: should do something here */
 	return (0);
 }
 
+struct hpuxsemop_args {
+	int semid;
+	struct sembuf *sops;
+	u_int nsops;
+};
 hpuxsemop(p, uap, retval)
 	struct proc *p;
-	struct args {
-		int semid;
-		struct sembuf *sops;
-		u_int nsops;
-	} *uap;
+	struct hpuxsemop_args *uap;
 	int *retval;
 {
 	/* XXX: should do something here */
@@ -985,13 +1011,14 @@ hpuxtobsdioctl(com)
  *	no FIOCLEX/FIONCLEX/FIOASYNC/FIOGETOWN/FIOSETOWN
  *	the sgttyb struct is 2 bytes longer
  */
+struct hpuxioctl_args {
+	int	fdes;
+	int	cmd;
+	caddr_t	cmarg;
+};
 hpuxioctl(p, uap, retval)
 	struct proc *p;
-	register struct args {
-		int	fdes;
-		int	cmd;
-		caddr_t	cmarg;
-	} *uap;
+	register struct hpuxioctl_args *uap;
 	int *retval;
 {
 	register struct filedesc *fdp = p->p_fd;
@@ -1121,12 +1148,13 @@ hpuxioctl(p, uap, retval)
 /*
  * Man page lies, behaviour here is based on observed behaviour.
  */
+struct hpuxgetcontext_args {
+	char *buf;
+	int len;
+};
 hpuxgetcontext(p, uap, retval)
 	struct proc *p;
-	struct args {
-		char *buf;
-		int len;
-	} *uap;
+	struct hpuxgetcontext_args *uap;
 	int *retval;
 {
 	int error = 0;
@@ -1154,11 +1182,12 @@ hpuxgetcontext(p, uap, retval)
  * This is the equivalent of BSD getpgrp but with more restrictions.
  * Note we do not check the real uid or "saved" uid.
  */
+struct hpuxgetpgrp2_args {
+	int pid;
+};
 hpuxgetpgrp2(cp, uap, retval)
 	struct proc *cp;
-	register struct args {
-		int pid;
-	} *uap;
+	register struct hpuxgetpgrp2_args *uap;
 	int *retval;
 {
 	register struct proc *p;
@@ -1179,12 +1208,13 @@ hpuxgetpgrp2(cp, uap, retval)
  * This is the equivalent of BSD setpgrp but with more restrictions.
  * Note we do not check the real uid or "saved" uid or pgrp.
  */
+struct hpuxsetpgrp2_args {
+	int	pid;
+	int	pgrp;
+};
 hpuxsetpgrp2(p, uap, retval)
 	struct proc *p;
-	struct args {
-		int	pid;
-		int	pgrp;
-	} *uap;
+	struct hpuxsetpgrp2_args *uap;
 	int *retval;
 {
 	/* empirically determined */
@@ -1196,14 +1226,15 @@ hpuxsetpgrp2(p, uap, retval)
 /*
  * XXX Same as old BSD setre[ug]id right now.  Need to consider saved ids.
  */
+struct hpuxsetresuid_args {
+	int	ruid;
+	int	euid;
+	int	suid;
+};
 /* ARGSUSED */
 hpuxsetresuid(p, uap, retval)
 	register struct proc *p;
-	struct args {
-		int	ruid;
-		int	euid;
-		int	suid;
-	} *uap;
+	struct hpuxsetresuid_args *uap;
 	int *retval;
 {
 	register struct pcred *pc = p->p_cred;
@@ -1242,14 +1273,15 @@ hpuxsetresuid(p, uap, retval)
 	return (0);
 }
 
+struct hpuxsetresgid_args {
+	int	rgid;
+	int	egid;
+	int	sgid;
+};
 /* ARGSUSED */
 hpuxsetresgid(p, uap, retval)
 	register struct proc *p;
-	struct args {
-		int	rgid;
-		int	egid;
-		int	sgid;
-	} *uap;
+	struct hpuxsetresgid_args *uap;
 	int *retval;
 {
 	register struct pcred *pc = p->p_cred;
@@ -1288,13 +1320,14 @@ hpuxsetresgid(p, uap, retval)
 /*
  * XXX: simple recognition hack to see if we can make grmd work.
  */
+struct hpuxlockf_args {
+	int fd;
+	int func;
+	long size;
+};
 hpuxlockf(p, uap, retval)
 	struct proc *p;
-	struct args {
-		int fd;
-		int func;
-		long size;
-	} *uap;
+	struct hpuxlockf_args *uap;
 	int *retval;
 {
 #ifdef DEBUG
@@ -1304,16 +1337,17 @@ hpuxlockf(p, uap, retval)
 	return (0);
 }
 
+struct hpuxgetaccess_args {
+	char	*path;
+	int	uid;
+	int	ngroups;
+	int	*gidset;
+	void	*label;
+	void	*privs;
+};
 hpuxgetaccess(p, uap, retval)
 	register struct proc *p;
-	register struct args {
-		char	*path;
-		int	uid;
-		int	ngroups;
-		int	*gidset;
-		void	*label;
-		void	*privs;
-	} *uap;
+	register struct hpuxgetaccess_args *uap;
 	int *retval;
 {
 	int lgroups[NGROUPS];
@@ -1610,27 +1644,29 @@ ohpuxsetpgrp(p, uap, retval)
 	return (0);
 }
 
+struct ohpuxtime_args {
+	long	*tp;
+};
 ohpuxtime(p, uap, retval)
 	struct proc *p;
-	register struct args {
-		long	*tp;
-	} *uap;
-	time_t *retval;
+	register struct ohpuxtime_args *uap;
+	int *retval;
 {
 	int error = 0;
 
 	if (uap->tp)
 		error = copyout((caddr_t)&time.tv_sec, (caddr_t)uap->tp,
 				sizeof (long));
-	*retval = time.tv_sec;
+	*(time_t *)retval = time.tv_sec;
 	return (error);
 }
 
+struct ohpuxstime_args {
+	int	time;
+};
 ohpuxstime(p, uap, retval)
 	struct proc *p;
-	register struct args {
-		int	time;
-	} *uap;
+	register struct ohpuxstime_args *uap;
 	int *retval;
 {
 	struct timeval tv;
@@ -1648,11 +1684,12 @@ ohpuxstime(p, uap, retval)
 	return (0);
 }
 
+struct ohpuxftime_args {
+	struct	hpuxtimeb *tp;
+};
 ohpuxftime(p, uap, retval)
 	struct proc *p;
-	register struct args {
-		struct	hpuxtimeb *tp;
-	} *uap;
+	register struct ohpuxftime_args *uap;
 	int *retval;
 {
 	struct hpuxtimeb tb;
@@ -1667,11 +1704,12 @@ ohpuxftime(p, uap, retval)
 	return (copyout((caddr_t)&tb, (caddr_t)uap->tp, sizeof (tb)));
 }
 
+struct ohpuxalarm_args {
+	int	deltat;
+};
 ohpuxalarm(p, uap, retval)
 	register struct proc *p;
-	register struct args {
-		int	deltat;
-	} *uap;
+	register struct ohpuxalarm_args *uap;
 	int *retval;
 {
 	int s = splhigh();
@@ -1694,11 +1732,12 @@ ohpuxalarm(p, uap, retval)
 	return (0);
 }
 
+struct ohpuxnice_args {
+	int	niceness;
+};
 ohpuxnice(p, uap, retval)
 	register struct proc *p;
-	register struct args {
-		int	niceness;
-	} *uap;
+	register struct ohpuxnice_args *uap;
 	int *retval;
 {
 	int error;
@@ -1709,12 +1748,13 @@ ohpuxnice(p, uap, retval)
 	return (error);
 }
 
+struct ohpuxtimes_args {
+	struct	tms *tmsb;
+};
 ohpuxtimes(p, uap, retval)
 	struct proc *p;
-	register struct args {
-		struct	tms *tmsb;
-	} *uap;
-	time_t *retval;
+	register struct ohpuxtimes_args *uap;
+	int *retval;
 {
 	struct timeval ru, rs;
 	struct tms atms;
@@ -1727,7 +1767,7 @@ ohpuxtimes(p, uap, retval)
 	atms.tms_cstime = hpuxscale(&p->p_stats->p_cru.ru_stime);
 	error = copyout((caddr_t)&atms, (caddr_t)uap->tmsb, sizeof (atms));
 	if (error == 0)
-		*retval = hpuxscale(&time) - hpuxscale(&boottime);
+		*(time_t *)retval = hpuxscale(&time) - hpuxscale(&boottime);
 	return (error);
 }
 
@@ -1746,12 +1786,13 @@ hpuxscale(tvp)
  * Set IUPD and IACC times on file.
  * Can't set ICHG.
  */
+struct ohpuxutime_args {
+	char	*fname;
+	time_t	*tptr;
+};
 ohpuxutime(p, uap, retval)
 	struct proc *p;
-	register struct a {
-		char	*fname;
-		time_t	*tptr;
-	} *uap;
+	register struct ohpuxutime_args *uap;
 	int *retval;
 {
 	register struct vnode *vp;
@@ -1795,12 +1836,13 @@ ohpuxpause(p, uap, retval)
 /*
  * The old fstat system call.
  */
+struct ohpuxfstat_args {
+	int	fd;
+	struct ohpuxstat *sb;
+};
 ohpuxfstat(p, uap, retval)
 	struct proc *p;
-	register struct args {
-		int	fd;
-		struct ohpuxstat *sb;
-	} *uap;
+	register struct ohpuxfstat_args *uap;
 	int *retval;
 {
 	register struct filedesc *fdp = p->p_fd;
@@ -1817,12 +1859,13 @@ ohpuxfstat(p, uap, retval)
 /*
  * Old stat system call.  This version follows links.
  */
+struct ohpuxstat_args {
+	char	*fname;
+	struct ohpuxstat *sb;
+};
 ohpuxstat(p, uap, retval)
 	struct proc *p;
-	register struct args {
-		char	*fname;
-		struct ohpuxstat *sb;
-	} *uap;
+	register struct ohpuxstat_args *uap;
 	int *retval;
 {
 	int error;
diff --git a/usr/src/sys/kern/kern_acct.c b/usr/src/sys/kern/kern_acct.c
index d326f2a664..0bb04b6085 100644
--- a/usr/src/sys/kern/kern_acct.c
+++ b/usr/src/sys/kern/kern_acct.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.proprietary.c%
  *
- *	@(#)kern_acct.c	7.24 (Berkeley) %G%
+ *	@(#)kern_acct.c	7.25 (Berkeley) %G%
  */
 
 #include "param.h"
@@ -47,11 +47,12 @@ struct	vnode *savacctp;
  * accounting is resumed.
  */
 /* ARGSUSED */
+struct sysacct_args {
+	char	*fname;
+};
 sysacct(p, uap, retval)
 	struct proc *p;
-	struct args {
-		char	*fname;
-	} *uap;
+	struct sysacct_args *uap;
 	int *retval;
 {
 	register struct vnode *vp;
diff --git a/usr/src/sys/kern/kern_descrip.c b/usr/src/sys/kern/kern_descrip.c
index c858feb6ed..c8ed416bed 100644
--- a/usr/src/sys/kern/kern_descrip.c
+++ b/usr/src/sys/kern/kern_descrip.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
- *	@(#)kern_descrip.c	7.36 (Berkeley) %G%
+ *	@(#)kern_descrip.c	7.37 (Berkeley) %G%
  */
 
 #include "param.h"
diff --git a/usr/src/sys/kern/kern_exec.c b/usr/src/sys/kern/kern_exec.c
index a5c59f7fe7..e29cf20ab6 100644
--- a/usr/src/sys/kern/kern_exec.c
+++ b/usr/src/sys/kern/kern_exec.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.proprietary.c%
  *
- *	@(#)kern_exec.c	7.64 (Berkeley) %G%
+ *	@(#)kern_exec.c	7.65 (Berkeley) %G%
  */
 
 #include "param.h"
@@ -50,14 +50,15 @@ extern char sigcode[], esigcode[];
 /*
  * exec system call
  */
+struct execve_args {
+	char	*fname;
+	char	**argp;
+	char	**envp;
+};
 /* ARGSUSED */
 execve(p, uap, retval)
 	register struct proc *p;
-	register struct args {
-		char	*fname;
-		char	**argp;
-		char	**envp;
-	} *uap;
+	register struct execve_args *uap;
 	int *retval;
 {
 	register struct ucred *cred = p->p_ucred;
diff --git a/usr/src/sys/kern/kern_exit.c b/usr/src/sys/kern/kern_exit.c
index 9bc9f867f4..fd9d26951a 100644
--- a/usr/src/sys/kern/kern_exit.c
+++ b/usr/src/sys/kern/kern_exit.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
- *	@(#)kern_exit.c	7.47 (Berkeley) %G%
+ *	@(#)kern_exit.c	7.48 (Berkeley) %G%
  */
 
 #include "param.h"
@@ -37,12 +37,13 @@
 /*
  * Exit system call: pass back caller's arg
  */
+struct rexit_args {
+	int	rval;
+};
 /* ARGSUSED */
 rexit(p, uap, retval)
 	struct proc *p;
-	struct args {
-		int	rval;
-	} *uap;
+	struct rexit_args *uap;
 	int *retval;
 {
 
@@ -235,46 +236,44 @@ done:
 	/* NOTREACHED */
 }
 
+struct wait_args {
+	int	pid;
+	int	*status;
+	int	options;
+	struct	rusage *rusage;
+#ifdef COMPAT_43
+	int	compat;		/* pseudo */
+#endif
+};
+
 #ifdef COMPAT_43
 owait(p, uap, retval)
 	struct proc *p;
-	register struct args {
-		int	pid;
-		int	*status;
-		int	options;
-		struct	rusage *rusage;
-		int	compat;
-	} *uap;
+	register struct wait_args *uap;
 	int *retval;
 {
 
 #ifdef PSL_ALLCC
 	if ((p->p_md.md_regs[PS] & PSL_ALLCC) != PSL_ALLCC) {
 		uap->options = 0;
-		uap->rusage = 0;
+		uap->rusage = NULL;
 	} else {
 		uap->options = p->p_md.md_regs[R0];
 		uap->rusage = (struct rusage *)p->p_md.md_regs[R1];
 	}
 #else
 	uap->options = 0;
-	uap->rusage = 0;
+	uap->rusage = NULL;
 #endif
 	uap->pid = WAIT_ANY;
-	uap->status = 0;
+	uap->status = NULL;
 	uap->compat = 1;
 	return (wait1(p, uap, retval));
 }
 
 wait4(p, uap, retval)
 	struct proc *p;
-	struct args {
-		int	pid;
-		int	*status;
-		int	options;
-		struct	rusage *rusage;
-		int	compat;
-	} *uap;
+	struct wait_args *uap;
 	int *retval;
 {
 
@@ -292,15 +291,7 @@ wait4(p, uap, retval)
  */
 wait1(q, uap, retval)
 	register struct proc *q;
-	register struct args {
-		int	pid;
-		int	*status;
-		int	options;
-		struct	rusage *rusage;
-#ifdef COMPAT_43
-		int compat;
-#endif
-	} *uap;
+	register struct wait_args *uap;
 	int retval[];
 {
 	register int nfound;
diff --git a/usr/src/sys/kern/kern_fork.c b/usr/src/sys/kern/kern_fork.c
index 488b18b9e8..52984714e3 100644
--- a/usr/src/sys/kern/kern_fork.c
+++ b/usr/src/sys/kern/kern_fork.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
- *	@(#)kern_fork.c	7.37 (Berkeley) %G%
+ *	@(#)kern_fork.c	7.38 (Berkeley) %G%
  */
 
 #include "param.h"
@@ -20,10 +20,13 @@
 #include "acct.h"
 #include "ktrace.h"
 
+struct fork_args {
+	int	dummy;
+};
 /* ARGSUSED */
 fork(p, uap, retval)
 	struct proc *p;
-	struct args *uap;
+	struct fork_args *uap;
 	int retval[];
 {
 
@@ -33,7 +36,7 @@ fork(p, uap, retval)
 /* ARGSUSED */
 vfork(p, uap, retval)
 	struct proc *p;
-	struct args *uap;
+	struct fork_args *uap;
 	int retval[];
 {
 
diff --git a/usr/src/sys/kern/kern_ktrace.c b/usr/src/sys/kern/kern_ktrace.c
index ff3a981e2a..2bb8452fa4 100644
--- a/usr/src/sys/kern/kern_ktrace.c
+++ b/usr/src/sys/kern/kern_ktrace.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
- *	@(#)kern_ktrace.c	7.19 (Berkeley) %G%
+ *	@(#)kern_ktrace.c	7.20 (Berkeley) %G%
  */
 
 #ifdef KTRACE
@@ -185,15 +185,16 @@ ktrcsw(vp, out, user)
 /*
  * ktrace system call
  */
+struct ktrace_args {
+	char	*fname;
+	int	ops;
+	int	facs;
+	int	pid;
+};
 /* ARGSUSED */
 ktrace(curp, uap, retval)
 	struct proc *curp;
-	register struct args {
-		char	*fname;
-		int	ops;
-		int	facs;
-		int	pid;
-	} *uap;
+	register struct ktrace_args *uap;
 	int *retval;
 {
 	register struct vnode *vp = NULL;
diff --git a/usr/src/sys/kern/kern_prot.c b/usr/src/sys/kern/kern_prot.c
index bfc5b7baef..ef71ba5fd5 100644
--- a/usr/src/sys/kern/kern_prot.c
+++ b/usr/src/sys/kern/kern_prot.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
- *	@(#)kern_prot.c	7.24 (Berkeley) %G%
+ *	@(#)kern_prot.c	7.25 (Berkeley) %G%
  */
 
 /*
@@ -20,10 +20,14 @@
 #include "times.h"
 #include "malloc.h"
 
+struct args {
+	int	dummy;
+};
+
 /* ARGSUSED */
 getpid(p, uap, retval)
 	struct proc *p;
-	void *uap;
+	struct args *uap;
 	int *retval;
 {
 
@@ -37,7 +41,7 @@ getpid(p, uap, retval)
 /* ARGSUSED */
 getppid(p, uap, retval)
 	struct proc *p;
-	void *uap;
+	struct args *uap;
 	int *retval;
 {
 
@@ -48,7 +52,7 @@ getppid(p, uap, retval)
 /* Get process group ID; note that POSIX getpgrp takes no parameter */
 getpgrp(p, uap, retval)
 	struct proc *p;
-	void *uap;
+	struct args *uap;
 	int *retval;
 {
 
@@ -59,7 +63,7 @@ getpgrp(p, uap, retval)
 /* ARGSUSED */
 getuid(p, uap, retval)
 	struct proc *p;
-	void *uap;
+	struct args *uap;
 	int *retval;
 {
 
@@ -73,7 +77,7 @@ getuid(p, uap, retval)
 /* ARGSUSED */
 geteuid(p, uap, retval)
 	struct proc *p;
-	void *uap;
+	struct args *uap;
 	int *retval;
 {
 
@@ -84,7 +88,7 @@ geteuid(p, uap, retval)
 /* ARGSUSED */
 getgid(p, uap, retval)
 	struct proc *p;
-	void *uap;
+	struct args *uap;
 	int *retval;
 {
 
@@ -103,7 +107,7 @@ getgid(p, uap, retval)
 /* ARGSUSED */
 getegid(p, uap, retval)
 	struct proc *p;
-	void *uap;
+	struct args *uap;
 	int *retval;
 {
 
@@ -111,12 +115,13 @@ getegid(p, uap, retval)
 	return (0);
 }
 
+struct getgroups_args {
+	u_int	gidsetsize;
+	int	*gidset;		/* XXX not yet POSIX */
+};
 getgroups(p, uap, retval)
 	struct proc *p;
-	register struct	arg {
-		u_int	gidsetsize;
-		int	*gidset;		/* XXX not yet POSIX */
-	} *uap;
+	register struct	getgroups_args *uap;
 	int *retval;
 {
 	register struct pcred *pc = p->p_cred;
@@ -145,7 +150,7 @@ getgroups(p, uap, retval)
 /* ARGSUSED */
 setsid(p, uap, retval)
 	register struct proc *p;
-	void *uap;
+	struct args *uap;
 	int *retval;
 {
 
@@ -171,13 +176,14 @@ setsid(p, uap, retval)
  * 	there must exist some pid in same session having pgid (EPERM)
  * pid must not be session leader (EPERM)
  */
+struct setpgid_args {
+	int	pid;	/* target process id */
+	int	pgid;	/* target pgrp id */
+};
 /* ARGSUSED */
 setpgid(curp, uap, retval)
 	struct proc *curp;
-	register struct args {
-		int	pid;	/* target process id */
-		int	pgid;	/* target pgrp id */
-	} *uap;
+	register struct setpgid_args *uap;
 	int *retval;
 {
 	register struct proc *targp;		/* target process */
@@ -204,12 +210,13 @@ setpgid(curp, uap, retval)
 	return (0);
 }
 
+struct setuid_args {
+	int	uid;
+};
 /* ARGSUSED */
 setuid(p, uap, retval)
 	struct proc *p;
-	struct args {
-		int	uid;
-	} *uap;
+	struct setuid_args *uap;
 	int *retval;
 {
 	register struct pcred *pc = p->p_cred;
@@ -232,12 +239,13 @@ setuid(p, uap, retval)
 	return (0);
 }
 
+struct seteuid_args {
+	int	euid;
+};
 /* ARGSUSED */
 seteuid(p, uap, retval)
 	struct proc *p;
-	struct args {
-		int	euid;
-	} *uap;
+	struct seteuid_args *uap;
 	int *retval;
 {
 	register struct pcred *pc = p->p_cred;
@@ -258,12 +266,13 @@ seteuid(p, uap, retval)
 	return (0);
 }
 
+struct setgid_args {
+	int	gid;
+};
 /* ARGSUSED */
 setgid(p, uap, retval)
 	struct proc *p;
-	struct args {
-		int	gid;
-	} *uap;
+	struct setgid_args *uap;
 	int *retval;
 {
 	register struct pcred *pc = p->p_cred;
@@ -281,12 +290,13 @@ setgid(p, uap, retval)
 	return (0);
 }
 
+struct setegid_args {
+	int	egid;
+};
 /* ARGSUSED */
 setegid(p, uap, retval)
 	struct proc *p;
-	struct args {
-		int	egid;
-	} *uap;
+	struct setegid_args *uap;
 	int *retval;
 {
 	register struct pcred *pc = p->p_cred;
@@ -303,13 +313,14 @@ setegid(p, uap, retval)
 	return (0);
 }
 
+struct setgroups_args {
+	u_int	gidsetsize;
+	int	*gidset;
+};
 /* ARGSUSED */
 setgroups(p, uap, retval)
 	struct proc *p;
-	struct args {
-		u_int	gidsetsize;
-		int	*gidset;
-	} *uap;
+	struct setgroups_args *uap;
 	int *retval;
 {
 	register struct pcred *pc = p->p_cred;
@@ -436,13 +447,14 @@ crdup(cr)
 /*
  * Get login name, if available.
  */
+struct getlogin_args {
+	char	*namebuf;
+	u_int	namelen;
+};
 /* ARGSUSED */
 getlogin(p, uap, retval)
 	struct proc *p;
-	struct args {
-		char	*namebuf;
-		u_int	namelen;
-	} *uap;
+	struct getlogin_args *uap;
 	int *retval;
 {
 
@@ -455,12 +467,13 @@ getlogin(p, uap, retval)
 /*
  * Set login name.
  */
+struct setlogin_args {
+	char	*namebuf;
+};
 /* ARGSUSED */
 setlogin(p, uap, retval)
 	struct proc *p;
-	struct args {
-		char	*namebuf;
-	} *uap;
+	struct setlogin_args *uap;
 	int *retval;
 {
 	int error;
diff --git a/usr/src/sys/kern/kern_resource.c b/usr/src/sys/kern/kern_resource.c
index 9108ea17eb..8041c5eebe 100644
--- a/usr/src/sys/kern/kern_resource.c
+++ b/usr/src/sys/kern/kern_resource.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
- *	@(#)kern_resource.c	7.20 (Berkeley) %G%
+ *	@(#)kern_resource.c	7.21 (Berkeley) %G%
  */
 
 #include "param.h"
diff --git a/usr/src/sys/kern/kern_sig.c b/usr/src/sys/kern/kern_sig.c
index fb71cd8c36..9a2fc94217 100644
--- a/usr/src/sys/kern/kern_sig.c
+++ b/usr/src/sys/kern/kern_sig.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
- *	@(#)kern_sig.c	7.49 (Berkeley) %G%
+ *	@(#)kern_sig.c	7.50 (Berkeley) %G%
  */
 
 #define	SIGPROP		/* include signal properties table */
@@ -41,14 +41,15 @@
 	    (pc)->pc_ucred->cr_uid == (q)->p_ucred->cr_uid || \
 	    ((signo) == SIGCONT && (q)->p_session == (p)->p_session))
 
+struct sigaction_args {
+	int	signo;
+	struct	sigaction *nsa;
+	struct	sigaction *osa;
+};
 /* ARGSUSED */
 sigaction(p, uap, retval)
 	struct proc *p;
-	register struct args {
-		int	signo;
-		struct	sigaction *nsa;
-		struct	sigaction *osa;
-	} *uap;
+	register struct sigaction_args *uap;
 	int *retval;
 {
 	struct sigaction vec;
@@ -199,12 +200,13 @@ execsigs(p)
  * and return old mask as return value;
  * the library stub does the rest.
  */
+struct sigprocmask_args {
+	int	how;
+	sigset_t mask;
+};
 sigprocmask(p, uap, retval)
 	register struct proc *p;
-	struct args {
-		int	how;
-		sigset_t mask;
-	} *uap;
+	struct sigprocmask_args *uap;
 	int *retval;
 {
 	int error = 0;
@@ -233,10 +235,13 @@ sigprocmask(p, uap, retval)
 	return (error);
 }
 
+struct sigpending_args {
+	int	dummy;
+};
 /* ARGSUSED */
 sigpending(p, uap, retval)
 	struct proc *p;
-	void *uap;
+	struct sigpending_args *uap;
 	int *retval;
 {
 
@@ -248,14 +253,15 @@ sigpending(p, uap, retval)
 /*
  * Generalized interface signal handler, 4.3-compatible.
  */
+struct osigvec_args {
+	int	signo;
+	struct	sigvec *nsv;
+	struct	sigvec *osv;
+};
 /* ARGSUSED */
 osigvec(p, uap, retval)
 	struct proc *p;
-	register struct args {
-		int	signo;
-		struct	sigvec *nsv;
-		struct	sigvec *osv;
-	} *uap;
+	register struct osigvec_args *uap;
 	int *retval;
 {
 	struct sigvec vec;
@@ -305,11 +311,12 @@ osigvec(p, uap, retval)
 	return (0);
 }
 
+struct osigblock_args {
+	int	mask;
+};
 osigblock(p, uap, retval)
 	register struct proc *p;
-	struct args {
-		int	mask;
-	} *uap;
+	struct osigblock_args *uap;
 	int *retval;
 {
 
@@ -320,11 +327,12 @@ osigblock(p, uap, retval)
 	return (0);
 }
 
+struct osigsetmask_args {
+	int	mask;
+};
 osigsetmask(p, uap, retval)
 	struct proc *p;
-	struct args {
-		int	mask;
-	} *uap;
+	struct osigsetmask_args *uap;
 	int *retval;
 {
 
@@ -341,12 +349,13 @@ osigsetmask(p, uap, retval)
  * in the meantime.  Note nonstandard calling convention:
  * libc stub passes mask, not pointer, to save a copyin.
  */
+struct sigsuspend_args {
+	sigset_t mask;
+};
 /* ARGSUSED */
 sigsuspend(p, uap, retval)
 	register struct proc *p;
-	struct args {
-		sigset_t mask;
-	} *uap;
+	struct sigsuspend_args *uap;
 	int *retval;
 {
 	register struct sigacts *ps = p->p_sigacts;
@@ -367,13 +376,14 @@ sigsuspend(p, uap, retval)
 }
 
 #if defined(COMPAT_43) || defined(COMPAT_SUNOS)
+struct osigstack_args {
+	struct	sigstack *nss;
+	struct	sigstack *oss;
+};
 /* ARGSUSED */
 osigstack(p, uap, retval)
 	struct proc *p;
-	register struct args {
-		struct	sigstack *nss;
-		struct	sigstack *oss;
-	} *uap;
+	register struct osigstack_args *uap;
 	int *retval;
 {
 	struct sigstack ss;
@@ -397,13 +407,14 @@ osigstack(p, uap, retval)
 }
 #endif /* COMPAT_43 || COMPAT_SUNOS */
 
+struct sigaltstack_args {
+	struct	sigaltstack *nss;
+	struct	sigaltstack *oss;
+};
 /* ARGSUSED */
 sigaltstack(p, uap, retval)
 	struct proc *p;
-	register struct args {
-		struct	sigaltstack *nss;
-		struct	sigaltstack *oss;
-	} *uap;
+	register struct sigaltstack_args *uap;
 	int *retval;
 {
 	struct sigacts *psp;
@@ -434,13 +445,14 @@ sigaltstack(p, uap, retval)
 	return (0);
 }
 
+struct kill_args {
+	int	pid;
+	int	signo;
+};
 /* ARGSUSED */
 kill(cp, uap, retval)
 	register struct proc *cp;
-	register struct args {
-		int	pid;
-		int	signo;
-	} *uap;
+	register struct kill_args *uap;
 	int *retval;
 {
 	register struct proc *p;
@@ -471,13 +483,14 @@ kill(cp, uap, retval)
 }
 
 #if defined(COMPAT_43) || defined(COMPAT_SUNOS)
+struct okillpg_args {
+	int	pgid;
+	int	signo;
+};
 /* ARGSUSED */
 okillpg(p, uap, retval)
 	struct proc *p;
-	register struct args {
-		int	pgid;
-		int	signo;
-	} *uap;
+	register struct okillpg_args *uap;
 	int *retval;
 {
 
@@ -1110,10 +1123,13 @@ out:
  * Nonexistent system call-- signal process (may want to handle it).
  * Flag error in case process won't see signal immediately (blocked or ignored).
  */
+struct nosys_args {
+	int	dummy;
+};
 /* ARGSUSED */
 nosys(p, args, retval)
 	struct proc *p;
-	void *args;
+	struct nosys_args *args;
 	int *retval;
 {
 
diff --git a/usr/src/sys/kern/kern_sysctl.c b/usr/src/sys/kern/kern_sysctl.c
index 9046baf6f4..9e69c0b297 100644
--- a/usr/src/sys/kern/kern_sysctl.c
+++ b/usr/src/sys/kern/kern_sysctl.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
- *	@(#)kern_sysctl.c	7.23 (Berkeley) %G%
+ *	@(#)kern_sysctl.c	7.24 (Berkeley) %G%
  */
 
 #include "param.h"
@@ -24,15 +24,16 @@ extern int kinfo_doproc(), kinfo_rtable(), kinfo_vnode(), kinfo_file();
 extern int kinfo_meter(), kinfo_loadavg(), kinfo_clockrate();
 struct kinfo_lock kinfo_lock;
 
+struct getkerninfo_args {
+	int	op;
+	char	*where;
+	int	*size;
+	int	arg;
+};
 /* ARGSUSED */
 getkerninfo(p, uap, retval)
 	struct proc *p;
-	register struct args {
-		int	op;
-		char	*where;
-		int	*size;
-		int	arg;
-	} *uap;
+	register struct getkerninfo_args *uap;
 	int *retval;
 {
 	int bufsize;		/* max size of users buffer */
diff --git a/usr/src/sys/kern/kern_time.c b/usr/src/sys/kern/kern_time.c
index 86d9c5b0ff..58c89cb236 100644
--- a/usr/src/sys/kern/kern_time.c
+++ b/usr/src/sys/kern/kern_time.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
- *	@(#)kern_time.c	7.17 (Berkeley) %G%
+ *	@(#)kern_time.c	7.18 (Berkeley) %G%
  */
 
 #include "param.h"
@@ -25,13 +25,14 @@
  * timers when they expire.
  */
 
+struct gettimeofday_args {
+	struct	timeval *tp;
+	struct	timezone *tzp;
+};
 /* ARGSUSED */
 gettimeofday(p, uap, retval)
 	struct proc *p;
-	register struct args {
-		struct	timeval *tp;
-		struct	timezone *tzp;
-	} *uap;
+	register struct gettimeofday_args *uap;
 	int *retval;
 {
 	struct timeval atv;
@@ -49,13 +50,14 @@ gettimeofday(p, uap, retval)
 	return (error);
 }
 
+struct settimeofday_args {
+	struct	timeval *tv;
+	struct	timezone *tzp;
+};
 /* ARGSUSED */
 settimeofday(p, uap, retval)
 	struct proc *p;
-	struct args {
-		struct	timeval *tv;
-		struct	timezone *tzp;
-	} *uap;
+	struct settimeofday_args *uap;
 	int *retval;
 {
 	struct timeval atv, delta;
@@ -97,13 +99,14 @@ int	tickdelta;			/* current clock skew, us. per tick */
 long	timedelta;			/* unapplied time correction, us. */
 long	bigadj = 1000000;		/* use 10x skew above bigadj us. */
 
+struct adjtime_args {
+	struct timeval *delta;
+	struct timeval *olddelta;
+};
 /* ARGSUSED */
 adjtime(p, uap, retval)
 	struct proc *p;
-	register struct args {
-		struct timeval *delta;
-		struct timeval *olddelta;
-	} *uap;
+	register struct adjtime_args *uap;
 	int *retval;
 {
 	struct timeval atv, oatv;
@@ -159,13 +162,14 @@ adjtime(p, uap, retval)
  * real time timers .it_interval.  Rather, we compute the next time in
  * absolute time the timer should go off.
  */
+struct getitimer_args {
+	u_int	which;
+	struct	itimerval *itv;
+};
 /* ARGSUSED */
 getitimer(p, uap, retval)
 	struct proc *p;
-	register struct args {
-		u_int	which;
-		struct	itimerval *itv;
-	} *uap;
+	register struct getitimer_args *uap;
 	int *retval;
 {
 	struct itimerval aitv;
@@ -195,13 +199,14 @@ getitimer(p, uap, retval)
 	    sizeof (struct itimerval)));
 }
 
+struct setitimer_args {
+	u_int	which;
+	struct	itimerval *itv, *oitv;
+};
 /* ARGSUSED */
 setitimer(p, uap, retval)
 	struct proc *p;
-	register struct args {
-		u_int	which;
-		struct	itimerval *itv, *oitv;
-	} *uap;
+	register struct setitimer_args *uap;
 	int *retval;
 {
 	struct itimerval aitv;
diff --git a/usr/src/sys/kern/kern_xxx.c b/usr/src/sys/kern/kern_xxx.c
index 23fd0ba81e..a7e835b3f8 100644
--- a/usr/src/sys/kern/kern_xxx.c
+++ b/usr/src/sys/kern/kern_xxx.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
- *	@(#)kern_xxx.c	7.18 (Berkeley) %G%
+ *	@(#)kern_xxx.c	7.19 (Berkeley) %G%
  */
 
 #include "param.h"
@@ -17,36 +17,41 @@ char	hostname[MAXHOSTNAMELEN];
 int	hostnamelen;
 long	hostid;
 
+struct gethostid_args {
+	int	dummy;
+};
 /* ARGSUSED */
 gethostid(p, uap, retval)
 	struct proc *p;
-	void *uap;
-	long *retval;
+	struct gethostid_args *uap;
+	int *retval;
 {
 
-	*retval = hostid;
+	*(long *)retval = hostid;
 	return (0);
 }
 
+struct sethostid_args {
+	long	hostid;
+};
 /* ARGSUSED */
 sethostid(p, uap, retval)
 	struct proc *p;
-	struct args {
-		long	hostid;
-	} *uap;
+	struct sethostid_args *uap;
 	int *retval;
 {
 	int error;
 
 }
 
+struct gethostname_args {
+	char	*hostname;
+	u_int	len;
+};
 /* ARGSUSED */
 gethostname(p, uap, retval)
 	struct proc *p;
-	struct args {
-		char	*hostname;
-		u_int	len;
-	} *uap;
+	struct gethostname_args *uap;
 	int *retval;
 {
 
@@ -55,13 +60,14 @@ gethostname(p, uap, retval)
 	return (copyout((caddr_t)hostname, (caddr_t)uap->hostname, uap->len));
 }
 
+struct sethostname_args {
+	char	*hostname;
+	u_int	len;
+};
 /* ARGSUSED */
 sethostname(p, uap, retval)
 	struct proc *p;
-	register struct args {
-		char	*hostname;
-		u_int	len;
-	} *uap;
+	register struct sethostname_args *uap;
 	int *retval;
 {
 	int error;
@@ -76,12 +82,13 @@ sethostname(p, uap, retval)
 	return (error);
 }
 
+struct reboot_args {
+	int	opt;
+};
 /* ARGSUSED */
 reboot(p, uap, retval)
 	struct proc *p;
-	struct args {
-		int	opt;
-	} *uap;
+	struct reboot_args *uap;
 	int *retval;
 {
 	int error;
diff --git a/usr/src/sys/kern/subr_prof.c b/usr/src/sys/kern/subr_prof.c
index ef23ae5bb3..5d8f0e5b17 100644
--- a/usr/src/sys/kern/subr_prof.c
+++ b/usr/src/sys/kern/subr_prof.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
- *	@(#)subr_prof.c	7.16 (Berkeley) %G%
+ *	@(#)subr_prof.c	7.17 (Berkeley) %G%
  */
 
 #include <sys/param.h>
@@ -69,15 +69,16 @@ kmstartup()
  * The scale factor is a fixed point number with 16 bits of fraction, so that
  * 1.0 is represented as 0x10000.  A scale factor of 0 turns off profiling.
  */
+struct profil_args {
+	caddr_t	buf;
+	u_int	bufsize;
+	u_int	offset;
+	u_int	scale;
+};
 /* ARGSUSED */
 profil(p, uap, retval)
 	struct proc *p;
-	register struct args {
-		caddr_t	buf;
-		u_int	bufsize;
-		u_int	offset;
-		u_int	scale;
-	} *uap;
+	register struct profil_args *uap;
 	int *retval;
 {
 	register struct uprof *upp;
diff --git a/usr/src/sys/kern/vfs_syscalls.c b/usr/src/sys/kern/vfs_syscalls.c
index 39bcbbc1c2..ca30957989 100644
--- a/usr/src/sys/kern/vfs_syscalls.c
+++ b/usr/src/sys/kern/vfs_syscalls.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
- *	@(#)vfs_syscalls.c	7.92 (Berkeley) %G%
+ *	@(#)vfs_syscalls.c	7.93 (Berkeley) %G%
  */
 
 #include "param.h"
@@ -39,15 +39,16 @@
 /*
  * Mount system call.
  */
+struct mount_args {
+	int	type;
+	char	*dir;
+	int	flags;
+	caddr_t	data;
+};
 /* ARGSUSED */
 mount(p, uap, retval)
 	struct proc *p;
-	register struct args {
-		int	type;
-		char	*dir;
-		int	flags;
-		caddr_t	data;
-	} *uap;
+	register struct mount_args *uap;
 	int *retval;
 {
 	register struct vnode *vp;
@@ -184,13 +185,14 @@ update:
  * Note: unmount takes a path to the vnode mounted on as argument,
  * not special file (as before).
  */
+struct unmount_args {
+	char	*pathp;
+	int	flags;
+};
 /* ARGSUSED */
 unmount(p, uap, retval)
 	struct proc *p;
-	register struct args {
-		char	*pathp;
-		int	flags;
-	} *uap;
+	register struct unmount_args *uap;
 	int *retval;
 {
 	register struct vnode *vp;
@@ -261,10 +263,13 @@ dounmount(mp, flags, p)
  * Sync system call.
  * Sync each mounted filesystem.
  */
+struct sync_args {
+	int	dummy;
+};
 /* ARGSUSED */
 sync(p, uap, retval)
 	struct proc *p;
-	void *uap;
+	struct sync_args *uap;
 	int *retval;
 {
 	register struct mount *mp;
@@ -291,15 +296,16 @@ sync(p, uap, retval)
 /*
  * Operate on filesystem quotas.
  */
+struct quotactl_args {
+	char *path;
+	int cmd;
+	int uid;
+	caddr_t arg;
+};
 /* ARGSUSED */
 quotactl(p, uap, retval)
 	struct proc *p;
-	register struct args {
-		char *path;
-		int cmd;
-		int uid;
-		caddr_t arg;
-	} *uap;
+	register struct quotactl_args *uap;
 	int *retval;
 {
 	register struct mount *mp;
@@ -317,13 +323,14 @@ quotactl(p, uap, retval)
 /*
  * Get filesystem statistics.
  */
+struct statfs_args {
+	char *path;
+	struct statfs *buf;
+};
 /* ARGSUSED */
 statfs(p, uap, retval)
 	struct proc *p;
-	register struct args {
-		char *path;
-		struct statfs *buf;
-	} *uap;
+	register struct statfs_args *uap;
 	int *retval;
 {
 	register struct mount *mp;
@@ -346,13 +353,14 @@ statfs(p, uap, retval)
 /*
  * Get filesystem statistics.
  */
+struct fstatfs_args {
+	int fd;
+	struct statfs *buf;
+};
 /* ARGSUSED */
 fstatfs(p, uap, retval)
 	struct proc *p;
-	register struct args {
-		int fd;
-		struct statfs *buf;
-	} *uap;
+	register struct fstatfs_args *uap;
 	int *retval;
 {
 	struct file *fp;
@@ -373,13 +381,14 @@ fstatfs(p, uap, retval)
 /*
  * Get statistics on all filesystems.
  */
+struct getfsstat_args {
+	struct statfs *buf;
+	long bufsize;
+	int flags;
+};
 getfsstat(p, uap, retval)
 	struct proc *p;
-	register struct args {
-		struct statfs *buf;
-		long bufsize;
-		int flags;
-	} *uap;
+	register struct getfsstat_args *uap;
 	int *retval;
 {
 	register struct mount *mp;
@@ -423,12 +432,13 @@ getfsstat(p, uap, retval)
 /*
  * Change current working directory to a given file descriptor.
  */
+struct fchdir_args {
+	int	fd;
+};
 /* ARGSUSED */
 fchdir(p, uap, retval)
 	struct proc *p;
-	struct args {
-		int	fd;
-	} *uap;
+	struct fchdir_args *uap;
 	int *retval;
 {
 	register struct filedesc *fdp = p->p_fd;
@@ -456,12 +466,13 @@ fchdir(p, uap, retval)
 /*
  * Change current working directory (``.'').
  */
+struct chdir_args {
+	char	*fname;
+};
 /* ARGSUSED */
 chdir(p, uap, retval)
 	struct proc *p;
-	struct args {
-		char	*fname;
-	} *uap;
+	struct chdir_args *uap;
 	int *retval;
 {
 	register struct filedesc *fdp = p->p_fd;
@@ -479,12 +490,13 @@ chdir(p, uap, retval)
 /*
  * Change notion of root (``/'') directory.
  */
+struct chroot_args {
+	char	*fname;
+};
 /* ARGSUSED */
 chroot(p, uap, retval)
 	struct proc *p;
-	struct args {
-		char	*fname;
-	} *uap;
+	struct chroot_args *uap;
 	int *retval;
 {
 	register struct filedesc *fdp = p->p_fd;
@@ -530,13 +542,14 @@ chdirec(ndp, p)
  * Check permissions, allocate an open file structure,
  * and call the device open routine if any.
  */
+struct open_args {
+	char	*fname;
+	int	mode;
+	int	crtmode;
+};
 open(p, uap, retval)
 	struct proc *p;
-	register struct args {
-		char	*fname;
-		int	mode;
-		int	crtmode;
-	} *uap;
+	register struct open_args *uap;
 	int *retval;
 {
 	register struct filedesc *fdp = p->p_fd;
@@ -605,19 +618,16 @@ open(p, uap, retval)
 /*
  * Creat system call.
  */
+struct ocreat_args {
+	char	*fname;
+	int	fmode;
+};
 ocreat(p, uap, retval)
 	struct proc *p;
-	register struct args {
-		char	*fname;
-		int	fmode;
-	} *uap;
+	register struct ocreat_args *uap;
 	int *retval;
 {
-	struct nargs {
-		char	*fname;
-		int	mode;
-		int	crtmode;
-	} openuap;
+	struct open_args openuap;
 
 	openuap.fname = uap->fname;
 	openuap.crtmode = uap->fmode;
@@ -629,14 +639,15 @@ ocreat(p, uap, retval)
 /*
  * Mknod system call.
  */
+struct mknod_args {
+	char	*fname;
+	int	fmode;
+	int	dev;
+};
 /* ARGSUSED */
 mknod(p, uap, retval)
 	struct proc *p;
-	register struct args {
-		char	*fname;
-		int	fmode;
-		int	dev;
-	} *uap;
+	register struct mknod_args *uap;
 	int *retval;
 {
 	register struct vnode *vp;
@@ -693,13 +704,14 @@ out:
 /*
  * Mkfifo system call.
  */
+struct mkfifo_args {
+	char	*fname;
+	int	fmode;
+};
 /* ARGSUSED */
 mkfifo(p, uap, retval)
 	struct proc *p;
-	register struct args {
-		char	*fname;
-		int	fmode;
-	} *uap;
+	register struct mkfifo_args *uap;
 	int *retval;
 {
 	struct vattr vattr;
@@ -732,13 +744,14 @@ mkfifo(p, uap, retval)
 /*
  * Link system call.
  */
+struct link_args {
+	char	*target;
+	char	*linkname;
+};
 /* ARGSUSED */
 link(p, uap, retval)
 	struct proc *p;
-	register struct args {
-		char	*target;
-		char	*linkname;
-	} *uap;
+	register struct link_args *uap;
 	int *retval;
 {
 	register struct vnode *vp, *xp;
@@ -787,13 +800,14 @@ out1:
 /*
  * Make a symbolic link.
  */
+struct symlink_args {
+	char	*target;
+	char	*linkname;
+};
 /* ARGSUSED */
 symlink(p, uap, retval)
 	struct proc *p;
-	register struct args {
-		char	*target;
-		char	*linkname;
-	} *uap;
+	register struct symlink_args *uap;
 	int *retval;
 {
 	struct vattr vattr;
@@ -831,12 +845,13 @@ out:
 /*
  * Delete a name from the filesystem.
  */
+struct unlink_args {
+	char	*name;
+};
 /* ARGSUSED */
 unlink(p, uap, retval)
 	struct proc *p;
-	struct args {
-		char	*name;
-	} *uap;
+	struct unlink_args *uap;
 	int *retval;
 {
 	register struct vnode *vp;
@@ -876,7 +891,7 @@ out:
 	return (error);
 }
 
-struct args_lseek {
+struct __lseek_args {
 	int	fdes;
 	int	pad;
 	off_t	off;
@@ -887,16 +902,17 @@ struct args_lseek {
 /*
  * Seek system call.
  */
+struct lseek_args {
+	int	fdes;
+	long	off;
+	int	sbase;
+};
 lseek(p, uap, retval)
 	struct proc *p;
-	register struct args {
-		int	fdes;
-		long	off;
-		int	sbase;
-	} *uap;
-	long *retval;
+	register struct lseek_args *uap;
+	int *retval;
 {
-	struct args_lseek nuap;
+	struct __lseek_args nuap;
 	off_t qret;
 	int error;
 
@@ -904,7 +920,7 @@ lseek(p, uap, retval)
 	nuap.off = uap->off;
 	nuap.sbase = uap->sbase;
 	error = __lseek(p, &nuap, &qret);
-	*retval = qret;
+	*(long *)retval = qret;
 	return (error);
 }
 #endif /* COMPAT_43 || COMPAT_SUNOS */
@@ -914,8 +930,8 @@ lseek(p, uap, retval)
  */
 __lseek(p, uap, retval)
 	struct proc *p;
-	register struct args_lseek *uap;
-	off_t *retval;
+	register struct __lseek_args *uap;
+	int *retval;
 {
 	struct ucred *cred = p->p_ucred;
 	register struct filedesc *fdp = p->p_fd;
@@ -948,20 +964,21 @@ __lseek(p, uap, retval)
 	default:
 		return (EINVAL);
 	}
-	*retval = fp->f_offset;
+	*(off_t *)retval = fp->f_offset;
 	return (0);
 }
 
 /*
  * Check access permissions.
  */
+struct saccess_args {
+	char	*fname;
+	int	fmode;
+};
 /* ARGSUSED */
 saccess(p, uap, retval)
 	struct proc *p;
-	register struct args {
-		char	*fname;
-		int	fmode;
-	} *uap;
+	register struct saccess_args *uap;
 	int *retval;
 {
 	register struct ucred *cred = p->p_ucred;
@@ -1003,13 +1020,14 @@ out1:
  * Stat system call.
  * This version follows links.
  */
+struct ostat_args {
+	char	*fname;
+	struct ostat *ub;
+};
 /* ARGSUSED */
 ostat(p, uap, retval)
 	struct proc *p;
-	register struct args {
-		char	*fname;
-		struct ostat *ub;
-	} *uap;
+	register struct ostat_args *uap;
 	int *retval;
 {
 	struct stat sb;
@@ -1033,13 +1051,14 @@ ostat(p, uap, retval)
  * Lstat system call.
  * This version does not follow links.
  */
+struct olstat_args {
+	char	*fname;
+	struct ostat *ub;
+};
 /* ARGSUSED */
 olstat(p, uap, retval)
 	struct proc *p;
-	register struct args {
-		char	*fname;
-		struct ostat *ub;
-	} *uap;
+	register struct olstat_args *uap;
 	int *retval;
 {
 	struct stat sb;
@@ -1092,13 +1111,14 @@ cvtstat(st, ost)
  * Stat system call.
  * This version follows links.
  */
+struct stat_args {
+	char	*fname;
+	struct stat *ub;
+};
 /* ARGSUSED */
 stat(p, uap, retval)
 	struct proc *p;
-	register struct args {
-		char	*fname;
-		struct stat *ub;
-	} *uap;
+	register struct stat_args *uap;
 	int *retval;
 {
 	struct stat sb;
@@ -1120,13 +1140,14 @@ stat(p, uap, retval)
  * Lstat system call.
  * This version does not follow links.
  */
+struct lstat_args {
+	char	*fname;
+	struct stat *ub;
+};
 /* ARGSUSED */
 lstat(p, uap, retval)
 	struct proc *p;
-	register struct args {
-		char	*fname;
-		struct stat *ub;
-	} *uap;
+	register struct lstat_args *uap;
 	int *retval;
 {
 	struct stat sb;
@@ -1147,14 +1168,15 @@ lstat(p, uap, retval)
 /*
  * Return target name of a symbolic link.
  */
+struct readlink_args {
+	char	*name;
+	char	*buf;
+	int	count;
+};
 /* ARGSUSED */
 readlink(p, uap, retval)
 	struct proc *p;
-	register struct args {
-		char	*name;
-		char	*buf;
-		int	count;
-	} *uap;
+	register struct readlink_args *uap;
 	int *retval;
 {
 	register struct vnode *vp;
@@ -1192,13 +1214,14 @@ out:
 /*
  * Change flags of a file given path name.
  */
+struct chflags_args {
+	char	*fname;
+	int	flags;
+};
 /* ARGSUSED */
 chflags(p, uap, retval)
 	struct proc *p;
-	register struct args {
-		char	*fname;
-		int	flags;
-	} *uap;
+	register struct chflags_args *uap;
 	int *retval;
 {
 	register struct vnode *vp;
@@ -1226,13 +1249,14 @@ out:
 /*
  * Change flags of a file given a file descriptor.
  */
+struct fchflags_args {
+	int	fd;
+	int	flags;
+};
 /* ARGSUSED */
 fchflags(p, uap, retval)
 	struct proc *p;
-	register struct args {
-		int	fd;
-		int	flags;
-	} *uap;
+	register struct fchflags_args *uap;
 	int *retval;
 {
 	struct vattr vattr;
@@ -1260,13 +1284,14 @@ out:
 /*
  * Change mode of a file given path name.
  */
+struct chmod_args {
+	char	*fname;
+	int	fmode;
+};
 /* ARGSUSED */
 chmod(p, uap, retval)
 	struct proc *p;
-	register struct args {
-		char	*fname;
-		int	fmode;
-	} *uap;
+	register struct chmod_args *uap;
 	int *retval;
 {
 	register struct vnode *vp;
@@ -1294,13 +1319,14 @@ out:
 /*
  * Change mode of a file given a file descriptor.
  */
+struct fchmod_args {
+	int	fd;
+	int	fmode;
+};
 /* ARGSUSED */
 fchmod(p, uap, retval)
 	struct proc *p;
-	register struct args {
-		int	fd;
-		int	fmode;
-	} *uap;
+	register struct fchmod_args *uap;
 	int *retval;
 {
 	struct vattr vattr;
@@ -1328,14 +1354,15 @@ out:
 /*
  * Set ownership given a path name.
  */
+struct chown_args {
+	char	*fname;
+	int	uid;
+	int	gid;
+};
 /* ARGSUSED */
 chown(p, uap, retval)
 	struct proc *p;
-	register struct args {
-		char	*fname;
-		int	uid;
-		int	gid;
-	} *uap;
+	register struct chown_args *uap;
 	int *retval;
 {
 	register struct vnode *vp;
@@ -1364,14 +1391,15 @@ out:
 /*
  * Set ownership given a file descriptor.
  */
+struct fchown_args {
+	int	fd;
+	int	uid;
+	int	gid;
+};
 /* ARGSUSED */
 fchown(p, uap, retval)
 	struct proc *p;
-	register struct args {
-		int	fd;
-		int	uid;
-		int	gid;
-	} *uap;
+	register struct fchown_args *uap;
 	int *retval;
 {
 	struct vattr vattr;
@@ -1400,13 +1428,14 @@ out:
 /*
  * Set the access and modification times of a file.
  */
+struct utimes_args {
+	char	*fname;
+	struct	timeval *tptr;
+};
 /* ARGSUSED */
 utimes(p, uap, retval)
 	struct proc *p;
-	register struct args {
-		char	*fname;
-		struct	timeval *tptr;
-	} *uap;
+	register struct utimes_args *uap;
 	int *retval;
 {
 	register struct vnode *vp;
@@ -1437,7 +1466,7 @@ out:
 	return (error);
 }
 
-struct args_truncate {
+struct __truncate_args {
 	char	*fname;
 	int	pad;
 	off_t	length;
@@ -1449,7 +1478,7 @@ struct args_truncate {
 /* ARGSUSED */
 __truncate(p, uap, retval)
 	struct proc *p;
-	register struct args_truncate *uap;
+	register struct __truncate_args *uap;
 	int *retval;
 {
 	register struct vnode *vp;
@@ -1477,7 +1506,7 @@ out:
 	return (error);
 }
 
-struct args_ftruncate {
+struct __ftruncate_args {
 	int	fd;
 	int	pad;
 	off_t	length;
@@ -1489,7 +1518,7 @@ struct args_ftruncate {
 /* ARGSUSED */
 __ftruncate(p, uap, retval)
 	struct proc *p;
-	register struct args_ftruncate *uap;
+	register struct __ftruncate_args *uap;
 	int *retval;
 {
 	struct vattr vattr;
@@ -1522,16 +1551,17 @@ out:
 /*
  * Truncate a file given its path name.
  */
+struct truncate_args {
+	char	*fname;
+	long	length;
+};
 /* ARGSUSED */
 truncate(p, uap, retval)
 	struct proc *p;
-	register struct args {
-		char	*fname;
-		long	length;
-	} *uap;
+	register struct truncate_args *uap;
 	int *retval;
 {
-	struct args_truncate nuap;
+	struct __truncate_args nuap;
 
 	nuap.fname = uap->fname;
 	nuap.length = uap->length;
@@ -1541,16 +1571,17 @@ truncate(p, uap, retval)
 /*
  * Truncate a file given a file descriptor.
  */
+struct ftruncate_args {
+	int	fd;
+	long	length;
+};
 /* ARGSUSED */
 ftruncate(p, uap, retval)
 	struct proc *p;
-	register struct args {
-		int	fd;
-		long	length;
-	} *uap;
+	register struct ftruncate_args *uap;
 	int *retval;
 {
-	struct args_ftruncate nuap;
+	struct __truncate_args nuap;
 
 	nuap.fd = uap->fd;
 	nuap.length = uap->length;
@@ -1561,12 +1592,13 @@ ftruncate(p, uap, retval)
 /*
  * Synch an open file.
  */
+struct fsync_args {
+	int	fd;
+};
 /* ARGSUSED */
 fsync(p, uap, retval)
 	struct proc *p;
-	struct args {
-		int	fd;
-	} *uap;
+	struct fsync_args *uap;
 	int *retval;
 {
 	register struct vnode *vp;
@@ -1588,13 +1620,14 @@ fsync(p, uap, retval)
  * Source and destination must either both be directories, or both
  * not be directories.  If target is a directory, it must be empty.
  */
+struct rename_args {
+	char	*from;
+	char	*to;
+};
 /* ARGSUSED */
 rename(p, uap, retval)
 	struct proc *p;
-	register struct args {
-		char	*from;
-		char	*to;
-	} *uap;
+	register struct rename_args *uap;
 	int *retval;
 {
 	register struct vnode *tvp, *fvp, *tdvp;
@@ -1675,13 +1708,14 @@ out1:
 /*
  * Mkdir system call.
  */
+struct mkdir_args {
+	char	*name;
+	int	dmode;
+};
 /* ARGSUSED */
 mkdir(p, uap, retval)
 	struct proc *p;
-	register struct args {
-		char	*name;
-		int	dmode;
-	} *uap;
+	register struct mkdir_args *uap;
 	int *retval;
 {
 	register struct vnode *vp;
@@ -1718,12 +1752,13 @@ mkdir(p, uap, retval)
 /*
  * Rmdir system call.
  */
+struct rmdir_args {
+	char	*name;
+};
 /* ARGSUSED */
 rmdir(p, uap, retval)
 	struct proc *p;
-	struct args {
-		char	*name;
-	} *uap;
+	struct rmdir_args *uap;
 	int *retval;
 {
 	register struct vnode *vp;
@@ -1772,14 +1807,15 @@ out:
 /*
  * Read a block of directory entries in a file system independent format.
  */
+struct ogetdirentries_args {
+	int	fd;
+	char	*buf;
+	unsigned count;
+	long	*basep;
+};
 ogetdirentries(p, uap, retval)
 	struct proc *p;
-	register struct args {
-		int	fd;
-		char	*buf;
-		unsigned count;
-		long	*basep;
-	} *uap;
+	register struct ogetdirentries_args *uap;
 	int *retval;
 {
 	register struct vnode *vp;
@@ -1857,14 +1893,15 @@ ogetdirentries(p, uap, retval)
 /*
  * Read a block of directory entries in a file system independent format.
  */
+struct getdirentries_args {
+	int	fd;
+	char	*buf;
+	unsigned count;
+	long	*basep;
+};
 getdirentries(p, uap, retval)
 	struct proc *p;
-	register struct args {
-		int	fd;
-		char	*buf;
-		unsigned count;
-		long	*basep;
-	} *uap;
+	register struct getdirentries_args *uap;
 	int *retval;
 {
 	register struct vnode *vp;
@@ -1904,12 +1941,13 @@ getdirentries(p, uap, retval)
 /*
  * Set the mode mask for creation of filesystem nodes.
  */
-mode_t
+struct umask_args {
+	int	mask;
+};
+mode_t				/* XXX */
 umask(p, uap, retval)
 	struct proc *p;
-	struct args {
-		int	mask;
-	} *uap;
+	struct umask_args *uap;
 	int *retval;
 {
 	register struct filedesc *fdp = p->p_fd;
@@ -1923,12 +1961,13 @@ umask(p, uap, retval)
  * Void all references to file by ripping underlying filesystem
  * away from vnode.
  */
+struct revoke_args {
+	char	*fname;
+};
 /* ARGSUSED */
 revoke(p, uap, retval)
 	struct proc *p;
-	register struct args {
-		char	*fname;
-	} *uap;
+	register struct revoke_args *uap;
 	int *retval;
 {
 	register struct vnode *vp;
diff --git a/usr/src/sys/nfs/nfs_syscalls.c b/usr/src/sys/nfs/nfs_syscalls.c
index 7b2e29bbc1..894d04d0e2 100644
--- a/usr/src/sys/nfs/nfs_syscalls.c
+++ b/usr/src/sys/nfs/nfs_syscalls.c
@@ -7,7 +7,7 @@
  *
  * %sccs.include.redist.c%
  *
- *	@(#)nfs_syscalls.c	7.31 (Berkeley) %G%
+ *	@(#)nfs_syscalls.c	7.32 (Berkeley) %G%
  */
 
 #include "param.h"
@@ -71,12 +71,13 @@ static int nfs_asyncdaemon[NFS_MAXASYNCDAEMON];
 /*
  * Get file handle system call
  */
+struct getfh_args {
+	char	*fname;
+	fhandle_t *fhp;
+};
 getfh(p, uap, retval)
 	struct proc *p;
-	register struct args {
-		char	*fname;
-		fhandle_t *fhp;
-	} *uap;
+	register struct getfh_args *uap;
 	int *retval;
 {
 	register struct vnode *vp;
@@ -115,12 +116,13 @@ static struct nfssvc_sock nfssvc_sockhead;
  * - remains in the kernel as an nfsd
  * - remains in the kernel as an nfsiod
  */
+struct nfssvc_args {
+	int flag;
+	caddr_t argp;
+};
 nfssvc(p, uap, retval)
 	struct proc *p;
-	register struct args {
-		int flag;
-		caddr_t argp;
-	} *uap;
+	register struct nfssvc_args *uap;
 	int *retval;
 {
 	struct nameidata nd;
-- 
2.20.1