Regenerated (fixed the calculation of sy_nargs in sysent tables).

19 files changed, 921 insertions, 887 deletions

diff --git a/sys/alpha/osf1/osf1_proto.h b/sys/alpha/osf1/osf1_proto.h
index d588e67..a5478c7 100644
--- a/sys/alpha/osf1/osf1_proto.h
+++ b/sys/alpha/osf1/osf1_proto.h
@@ -3,7 +3,7 @@
  *
  * DO NOT EDIT-- this file is automatically generated.
  * $FreeBSD$
- * created from;	FreeBSD
+ * created from;	FreeBSD: src/sys/alpha/osf1/syscalls.master,v 1.2 2000/05/09 18:23:16 bde Exp 
  */
 
 #ifndef _OSF1_SYSPROTO_H_
@@ -11,6 +11,8 @@
 
 #include <sys/signal.h>
 
+#include <sys/acl.h>
+
 struct proc;
 
 #define	PAD_(t)	(sizeof(register_t) <= sizeof(t) ? \
diff --git a/sys/alpha/osf1/osf1_syscall.h b/sys/alpha/osf1/osf1_syscall.h
index 70099ea..bc7f3d4 100644
--- a/sys/alpha/osf1/osf1_syscall.h
+++ b/sys/alpha/osf1/osf1_syscall.h
@@ -3,7 +3,7 @@
  *
  * DO NOT EDIT-- this file is automatically generated.
  * $FreeBSD$
- * created from;	FreeBSD
+ * created from;	FreeBSD: src/sys/alpha/osf1/syscalls.master,v 1.2 2000/05/09 18:23:16 bde Exp 
  */
 
 #define	OSF1_SYS_nosys	0
diff --git a/sys/alpha/osf1/osf1_sysent.c b/sys/alpha/osf1/osf1_sysent.c
index c304174..799e1da 100644
--- a/sys/alpha/osf1/osf1_sysent.c
+++ b/sys/alpha/osf1/osf1_sysent.c
@@ -3,7 +3,7 @@
  *
  * DO NOT EDIT-- this file is automatically generated.
  * $FreeBSD$
- * created from;	FreeBSD
+ * created from;	FreeBSD: src/sys/alpha/osf1/syscalls.master,v 1.2 2000/05/09 18:23:16 bde Exp 
  */
 
 #include "opt_compat.h"
@@ -14,175 +14,177 @@
 #include <alpha/osf1/osf1_signal.h>
 #include <alpha/osf1/osf1_proto.h>
 
+#define AS(name) (sizeof(struct name) / sizeof(register_t))
+
 /* The casts are bogus but will do for now. */
 struct sysent osf1_sysent[] = {
 	{ 0, (sy_call_t *)nosys },			/* 0 = nosys */
-	{ 1, (sy_call_t *)exit },			/* 1 = exit */
+	{ AS(rexit_args), (sy_call_t *)exit },		/* 1 = exit */
 	{ 0, (sy_call_t *)fork },			/* 2 = fork */
-	{ 3, (sy_call_t *)read },			/* 3 = read */
-	{ 3, (sy_call_t *)write },			/* 4 = write */
+	{ AS(read_args), (sy_call_t *)read },		/* 3 = read */
+	{ AS(write_args), (sy_call_t *)write },		/* 4 = write */
 	{ 0, (sy_call_t *)nosys },			/* 5 = old open */
-	{ 1, (sy_call_t *)close },			/* 6 = close */
-	{ 4, (sy_call_t *)osf1_wait4 },			/* 7 = osf1_wait4 */
+	{ AS(close_args), (sy_call_t *)close },		/* 6 = close */
+	{ AS(osf1_wait4_args), (sy_call_t *)osf1_wait4 },	/* 7 = osf1_wait4 */
 	{ 0, (sy_call_t *)nosys },			/* 8 = old creat */
-	{ 2, (sy_call_t *)link },			/* 9 = link */
-	{ 1, (sy_call_t *)unlink },			/* 10 = unlink */
+	{ AS(link_args), (sy_call_t *)link },		/* 9 = link */
+	{ AS(unlink_args), (sy_call_t *)unlink },	/* 10 = unlink */
 	{ 0, (sy_call_t *)nosys },			/* 11 = execv */
-	{ 1, (sy_call_t *)chdir },			/* 12 = chdir */
-	{ 1, (sy_call_t *)fchdir },			/* 13 = fchdir */
-	{ 3, (sy_call_t *)osf1_mknod },			/* 14 = osf1_mknod */
-	{ 2, (sy_call_t *)chmod },			/* 15 = chmod */
-	{ 3, (sy_call_t *)chown },			/* 16 = chown */
-	{ 1, (sy_call_t *)obreak },			/* 17 = obreak */
-	{ 3, (sy_call_t *)osf1_getfsstat },		/* 18 = osf1_getfsstat */
-	{ 4, (sy_call_t *)osf1_lseek },			/* 19 = osf1_lseek */
+	{ AS(chdir_args), (sy_call_t *)chdir },		/* 12 = chdir */
+	{ AS(fchdir_args), (sy_call_t *)fchdir },	/* 13 = fchdir */
+	{ AS(osf1_mknod_args), (sy_call_t *)osf1_mknod },	/* 14 = osf1_mknod */
+	{ AS(chmod_args), (sy_call_t *)chmod },		/* 15 = chmod */
+	{ AS(chown_args), (sy_call_t *)chown },		/* 16 = chown */
+	{ AS(obreak_args), (sy_call_t *)obreak },	/* 17 = obreak */
+	{ AS(osf1_getfsstat_args), (sy_call_t *)osf1_getfsstat },	/* 18 = osf1_getfsstat */
+	{ AS(osf1_lseek_args), (sy_call_t *)osf1_lseek },	/* 19 = osf1_lseek */
 	{ 0, (sy_call_t *)getpid },			/* 20 = getpid */
-	{ 4, (sy_call_t *)osf1_mount },			/* 21 = osf1_mount */
-	{ 2, (sy_call_t *)osf1_unmount },		/* 22 = osf1_unmount */
-	{ 1, (sy_call_t *)osf1_setuid },		/* 23 = osf1_setuid */
+	{ AS(osf1_mount_args), (sy_call_t *)osf1_mount },	/* 21 = osf1_mount */
+	{ AS(osf1_unmount_args), (sy_call_t *)osf1_unmount },	/* 22 = osf1_unmount */
+	{ AS(osf1_setuid_args), (sy_call_t *)osf1_setuid },	/* 23 = osf1_setuid */
 	{ 0, (sy_call_t *)getuid },			/* 24 = getuid */
 	{ 0, (sy_call_t *)nosys },			/* 25 = exec_with_loader */
 	{ 0, (sy_call_t *)nosys },			/* 26 = ptrace */
 	{ 0, (sy_call_t *)nosys },			/* 27 = recvmsg */
 	{ 0, (sy_call_t *)nosys },			/* 28 = sendmsg */
-	{ 6, (sy_call_t *)recvfrom },			/* 29 = recvfrom */
-	{ 3, (sy_call_t *)accept },			/* 30 = accept */
-	{ 3, (sy_call_t *)getpeername },		/* 31 = getpeername */
-	{ 3, (sy_call_t *)getsockname },		/* 32 = getsockname */
-	{ 2, (sy_call_t *)osf1_access },		/* 33 = osf1_access */
+	{ AS(recvfrom_args), (sy_call_t *)recvfrom },	/* 29 = recvfrom */
+	{ AS(accept_args), (sy_call_t *)accept },	/* 30 = accept */
+	{ AS(getpeername_args), (sy_call_t *)getpeername },	/* 31 = getpeername */
+	{ AS(getsockname_args), (sy_call_t *)getsockname },	/* 32 = getsockname */
+	{ AS(osf1_access_args), (sy_call_t *)osf1_access },	/* 33 = osf1_access */
 	{ 0, (sy_call_t *)nosys },			/* 34 = chflags */
 	{ 0, (sy_call_t *)nosys },			/* 35 = fchflags */
 	{ 0, (sy_call_t *)sync },			/* 36 = sync */
-	{ 2, (sy_call_t *)osf1_kill },			/* 37 = osf1_kill */
+	{ AS(osf1_kill_args), (sy_call_t *)osf1_kill },	/* 37 = osf1_kill */
 	{ 0, (sy_call_t *)nosys },			/* 38 = old stat */
-	{ 2, (sy_call_t *)setpgid },			/* 39 = setpgid */
+	{ AS(setpgid_args), (sy_call_t *)setpgid },	/* 39 = setpgid */
 	{ 0, (sy_call_t *)nosys },			/* 40 = old lstat */
-	{ 1, (sy_call_t *)dup },			/* 41 = dup */
+	{ AS(dup_args), (sy_call_t *)dup },		/* 41 = dup */
 	{ 0, (sy_call_t *)pipe },			/* 42 = pipe */
-	{ 4, (sy_call_t *)osf1_set_program_attributes },		/* 43 = osf1_set_program_attributes */
+	{ AS(osf1_set_program_attributes_args), (sy_call_t *)osf1_set_program_attributes },	/* 43 = osf1_set_program_attributes */
 	{ 0, (sy_call_t *)nosys },			/* 44 = profil */
-	{ 3, (sy_call_t *)osf1_open },			/* 45 = osf1_open */
+	{ AS(osf1_open_args), (sy_call_t *)osf1_open },	/* 45 = osf1_open */
 	{ 0, (sy_call_t *)nosys },			/* 46 = obsolete sigaction */
 	{ 0, (sy_call_t *)getgid },			/* 47 = getgid */
-	{ 2, (sy_call_t *)osf1_sigprocmask },		/* 48 = osf1_sigprocmask */
-	{ 2, (sy_call_t *)getlogin },			/* 49 = getlogin */
-	{ 1, (sy_call_t *)setlogin },			/* 50 = setlogin */
-	{ 1, (sy_call_t *)acct },			/* 51 = acct */
-	{ 2, (sy_call_t *)osf1_sigpending },		/* 52 = osf1_sigpending */
-	{ 4, (sy_call_t *)osf1_classcntl },		/* 53 = osf1_classcntl */
-	{ 3, (sy_call_t *)osf1_ioctl },			/* 54 = osf1_ioctl */
-	{ 1, (sy_call_t *)osf1_reboot },		/* 55 = osf1_reboot */
-	{ 1, (sy_call_t *)revoke },			/* 56 = revoke */
-	{ 2, (sy_call_t *)symlink },			/* 57 = symlink */
-	{ 3, (sy_call_t *)readlink },			/* 58 = readlink */
-	{ 3, (sy_call_t *)osf1_execve },		/* 59 = osf1_execve */
-	{ 1, (sy_call_t *)umask },			/* 60 = umask */
-	{ 1, (sy_call_t *)chroot },			/* 61 = chroot */
+	{ AS(osf1_sigprocmask_args), (sy_call_t *)osf1_sigprocmask },	/* 48 = osf1_sigprocmask */
+	{ AS(getlogin_args), (sy_call_t *)getlogin },	/* 49 = getlogin */
+	{ AS(setlogin_args), (sy_call_t *)setlogin },	/* 50 = setlogin */
+	{ AS(acct_args), (sy_call_t *)acct },		/* 51 = acct */
+	{ AS(osf1_sigpending_args), (sy_call_t *)osf1_sigpending },	/* 52 = osf1_sigpending */
+	{ AS(osf1_classcntl_args), (sy_call_t *)osf1_classcntl },	/* 53 = osf1_classcntl */
+	{ AS(osf1_ioctl_args), (sy_call_t *)osf1_ioctl },	/* 54 = osf1_ioctl */
+	{ AS(osf1_reboot_args), (sy_call_t *)osf1_reboot },	/* 55 = osf1_reboot */
+	{ AS(revoke_args), (sy_call_t *)revoke },	/* 56 = revoke */
+	{ AS(symlink_args), (sy_call_t *)symlink },	/* 57 = symlink */
+	{ AS(readlink_args), (sy_call_t *)readlink },	/* 58 = readlink */
+	{ AS(osf1_execve_args), (sy_call_t *)osf1_execve },	/* 59 = osf1_execve */
+	{ AS(umask_args), (sy_call_t *)umask },		/* 60 = umask */
+	{ AS(chroot_args), (sy_call_t *)chroot },	/* 61 = chroot */
 	{ 0, (sy_call_t *)nosys },			/* 62 = old fstat */
 	{ 0, (sy_call_t *)getpgrp },			/* 63 = getpgrp */
 	{ 0, (sy_call_t *)ogetpagesize },		/* 64 = ogetpagesize */
 	{ 0, (sy_call_t *)nosys },			/* 65 = mremap */
 	{ 0, (sy_call_t *)vfork },			/* 66 = vfork */
-	{ 2, (sy_call_t *)osf1_stat },			/* 67 = osf1_stat */
-	{ 2, (sy_call_t *)osf1_lstat },			/* 68 = osf1_lstat */
+	{ AS(osf1_stat_args), (sy_call_t *)osf1_stat },	/* 67 = osf1_stat */
+	{ AS(osf1_lstat_args), (sy_call_t *)osf1_lstat },	/* 68 = osf1_lstat */
 	{ 0, (sy_call_t *)nosys },			/* 69 = sbrk */
 	{ 0, (sy_call_t *)nosys },			/* 70 = sstk */
-	{ 7, (sy_call_t *)osf1_mmap },			/* 71 = osf1_mmap */
+	{ AS(osf1_mmap_args), (sy_call_t *)osf1_mmap },	/* 71 = osf1_mmap */
 	{ 0, (sy_call_t *)nosys },			/* 72 = ovadvise */
-	{ 2, (sy_call_t *)munmap },			/* 73 = munmap */
-	{ 3, (sy_call_t *)mprotect },			/* 74 = mprotect */
+	{ AS(munmap_args), (sy_call_t *)munmap },	/* 73 = munmap */
+	{ AS(mprotect_args), (sy_call_t *)mprotect },	/* 74 = mprotect */
 	{ 0, (sy_call_t *)osf1_madvise },		/* 75 = osf1_madvise */
 	{ 0, (sy_call_t *)nosys },			/* 76 = old vhangup */
 	{ 0, (sy_call_t *)nosys },			/* 77 = kmodcall */
 	{ 0, (sy_call_t *)nosys },			/* 78 = mincore */
-	{ 2, (sy_call_t *)getgroups },			/* 79 = getgroups */
-	{ 2, (sy_call_t *)setgroups },			/* 80 = setgroups */
+	{ AS(getgroups_args), (sy_call_t *)getgroups },	/* 79 = getgroups */
+	{ AS(setgroups_args), (sy_call_t *)setgroups },	/* 80 = setgroups */
 	{ 0, (sy_call_t *)nosys },			/* 81 = old getpgrp */
-	{ 2, (sy_call_t *)osf1_setpgrp },		/* 82 = osf1_setpgrp */
-	{ 3, (sy_call_t *)osf1_setitimer },		/* 83 = osf1_setitimer */
+	{ AS(osf1_setpgrp_args), (sy_call_t *)osf1_setpgrp },	/* 82 = osf1_setpgrp */
+	{ AS(osf1_setitimer_args), (sy_call_t *)osf1_setitimer },	/* 83 = osf1_setitimer */
 	{ 0, (sy_call_t *)nosys },			/* 84 = old wait */
-	{ 5, (sy_call_t *)osf1_table },			/* 85 = osf1_table */
-	{ 2, (sy_call_t *)osf1_getitimer },		/* 86 = osf1_getitimer */
-	{ 2, (sy_call_t *)ogethostname },		/* 87 = ogethostname */
-	{ 2, (sy_call_t *)osethostname },		/* 88 = osethostname */
+	{ AS(osf1_table_args), (sy_call_t *)osf1_table },	/* 85 = osf1_table */
+	{ AS(osf1_getitimer_args), (sy_call_t *)osf1_getitimer },	/* 86 = osf1_getitimer */
+	{ AS(gethostname_args), (sy_call_t *)ogethostname },	/* 87 = ogethostname */
+	{ AS(sethostname_args), (sy_call_t *)osethostname },	/* 88 = osethostname */
 	{ 0, (sy_call_t *)getdtablesize },		/* 89 = getdtablesize */
-	{ 2, (sy_call_t *)dup2 },			/* 90 = dup2 */
-	{ 2, (sy_call_t *)osf1_fstat },			/* 91 = osf1_fstat */
-	{ 3, (sy_call_t *)osf1_fcntl },			/* 92 = osf1_fcntl */
-	{ 5, (sy_call_t *)osf1_select },		/* 93 = osf1_select */
-	{ 3, (sy_call_t *)poll },			/* 94 = poll */
-	{ 1, (sy_call_t *)fsync },			/* 95 = fsync */
-	{ 3, (sy_call_t *)setpriority },		/* 96 = setpriority */
-	{ 3, (sy_call_t *)osf1_socket },		/* 97 = osf1_socket */
-	{ 3, (sy_call_t *)connect },			/* 98 = connect */
-	{ 3, (sy_call_t *)oaccept },			/* 99 = oaccept */
-	{ 2, (sy_call_t *)getpriority },		/* 100 = getpriority */
-	{ 4, (sy_call_t *)osend },			/* 101 = osend */
-	{ 4, (sy_call_t *)orecv },			/* 102 = orecv */
-	{ 1, (sy_call_t *)osf1_sigreturn },		/* 103 = osf1_sigreturn */
-	{ 3, (sy_call_t *)bind },			/* 104 = bind */
-	{ 5, (sy_call_t *)setsockopt },			/* 105 = setsockopt */
-	{ 2, (sy_call_t *)listen },			/* 106 = listen */
+	{ AS(dup2_args), (sy_call_t *)dup2 },		/* 90 = dup2 */
+	{ AS(osf1_fstat_args), (sy_call_t *)osf1_fstat },	/* 91 = osf1_fstat */
+	{ AS(osf1_fcntl_args), (sy_call_t *)osf1_fcntl },	/* 92 = osf1_fcntl */
+	{ AS(osf1_select_args), (sy_call_t *)osf1_select },	/* 93 = osf1_select */
+	{ AS(poll_args), (sy_call_t *)poll },		/* 94 = poll */
+	{ AS(fsync_args), (sy_call_t *)fsync },		/* 95 = fsync */
+	{ AS(setpriority_args), (sy_call_t *)setpriority },	/* 96 = setpriority */
+	{ AS(osf1_socket_args), (sy_call_t *)osf1_socket },	/* 97 = osf1_socket */
+	{ AS(connect_args), (sy_call_t *)connect },	/* 98 = connect */
+	{ AS(accept_args), (sy_call_t *)oaccept },	/* 99 = oaccept */
+	{ AS(getpriority_args), (sy_call_t *)getpriority },	/* 100 = getpriority */
+	{ AS(osend_args), (sy_call_t *)osend },		/* 101 = osend */
+	{ AS(orecv_args), (sy_call_t *)orecv },		/* 102 = orecv */
+	{ AS(osf1_sigreturn_args), (sy_call_t *)osf1_sigreturn },	/* 103 = osf1_sigreturn */
+	{ AS(bind_args), (sy_call_t *)bind },		/* 104 = bind */
+	{ AS(setsockopt_args), (sy_call_t *)setsockopt },	/* 105 = setsockopt */
+	{ AS(listen_args), (sy_call_t *)listen },	/* 106 = listen */
 	{ 0, (sy_call_t *)nosys },			/* 107 = plock */
 	{ 0, (sy_call_t *)nosys },			/* 108 = old sigvec */
 	{ 0, (sy_call_t *)nosys },			/* 109 = old sigblock */
 	{ 0, (sy_call_t *)nosys },			/* 110 = old sigsetmask */
-	{ 1, (sy_call_t *)osf1_sigsuspend },		/* 111 = osf1_sigsuspend */
-	{ 2, (sy_call_t *)osf1_osigstack },		/* 112 = osf1_osigstack */
+	{ AS(osf1_sigsuspend_args), (sy_call_t *)osf1_sigsuspend },	/* 111 = osf1_sigsuspend */
+	{ AS(osf1_osigstack_args), (sy_call_t *)osf1_osigstack },	/* 112 = osf1_osigstack */
 	{ 0, (sy_call_t *)nosys },			/* 113 = old recvmsg */
 	{ 0, (sy_call_t *)nosys },			/* 114 = old sendmsg */
 	{ 0, (sy_call_t *)nosys },			/* 115 = vtrace */
-	{ 2, (sy_call_t *)osf1_gettimeofday },		/* 116 = osf1_gettimeofday */
-	{ 2, (sy_call_t *)osf1_getrusage },		/* 117 = osf1_getrusage */
-	{ 5, (sy_call_t *)getsockopt },			/* 118 = getsockopt */
+	{ AS(osf1_gettimeofday_args), (sy_call_t *)osf1_gettimeofday },	/* 116 = osf1_gettimeofday */
+	{ AS(osf1_getrusage_args), (sy_call_t *)osf1_getrusage },	/* 117 = osf1_getrusage */
+	{ AS(getsockopt_args), (sy_call_t *)getsockopt },	/* 118 = getsockopt */
 	{ 0, (sy_call_t *)nosys },			/* 119 =  */
-	{ 3, (sy_call_t *)osf1_readv },			/* 120 = osf1_readv */
-	{ 3, (sy_call_t *)osf1_writev },		/* 121 = osf1_writev */
-	{ 2, (sy_call_t *)settimeofday },		/* 122 = settimeofday */
-	{ 3, (sy_call_t *)fchown },			/* 123 = fchown */
-	{ 2, (sy_call_t *)fchmod },			/* 124 = fchmod */
-	{ 6, (sy_call_t *)orecvfrom },			/* 125 = orecvfrom */
-	{ 2, (sy_call_t *)setreuid },			/* 126 = setreuid */
-	{ 2, (sy_call_t *)setregid },			/* 127 = setregid */
-	{ 2, (sy_call_t *)rename },			/* 128 = rename */
-	{ 3, (sy_call_t *)osf1_truncate },		/* 129 = osf1_truncate */
-	{ 3, (sy_call_t *)osf1_ftruncate },		/* 130 = osf1_ftruncate */
-	{ 2, (sy_call_t *)flock },			/* 131 = flock */
-	{ 1, (sy_call_t *)osf1_setgid },		/* 132 = osf1_setgid */
-	{ 6, (sy_call_t *)osf1_sendto },		/* 133 = osf1_sendto */
-	{ 2, (sy_call_t *)shutdown },			/* 134 = shutdown */
+	{ AS(osf1_readv_args), (sy_call_t *)osf1_readv },	/* 120 = osf1_readv */
+	{ AS(osf1_writev_args), (sy_call_t *)osf1_writev },	/* 121 = osf1_writev */
+	{ AS(settimeofday_args), (sy_call_t *)settimeofday },	/* 122 = settimeofday */
+	{ AS(fchown_args), (sy_call_t *)fchown },	/* 123 = fchown */
+	{ AS(fchmod_args), (sy_call_t *)fchmod },	/* 124 = fchmod */
+	{ AS(recvfrom_args), (sy_call_t *)orecvfrom },	/* 125 = orecvfrom */
+	{ AS(setreuid_args), (sy_call_t *)setreuid },	/* 126 = setreuid */
+	{ AS(setregid_args), (sy_call_t *)setregid },	/* 127 = setregid */
+	{ AS(rename_args), (sy_call_t *)rename },	/* 128 = rename */
+	{ AS(osf1_truncate_args), (sy_call_t *)osf1_truncate },	/* 129 = osf1_truncate */
+	{ AS(osf1_ftruncate_args), (sy_call_t *)osf1_ftruncate },	/* 130 = osf1_ftruncate */
+	{ AS(flock_args), (sy_call_t *)flock },		/* 131 = flock */
+	{ AS(osf1_setgid_args), (sy_call_t *)osf1_setgid },	/* 132 = osf1_setgid */
+	{ AS(osf1_sendto_args), (sy_call_t *)osf1_sendto },	/* 133 = osf1_sendto */
+	{ AS(shutdown_args), (sy_call_t *)shutdown },	/* 134 = shutdown */
 	{ 0, (sy_call_t *)nosys },			/* 135 = socketpair */
-	{ 2, (sy_call_t *)mkdir },			/* 136 = mkdir */
-	{ 1, (sy_call_t *)rmdir },			/* 137 = rmdir */
-	{ 2, (sy_call_t *)utimes },			/* 138 = utimes */
+	{ AS(mkdir_args), (sy_call_t *)mkdir },		/* 136 = mkdir */
+	{ AS(rmdir_args), (sy_call_t *)rmdir },		/* 137 = rmdir */
+	{ AS(utimes_args), (sy_call_t *)utimes },	/* 138 = utimes */
 	{ 0, (sy_call_t *)nosys },			/* 139 = obsolete 4.2 sigreturn */
 	{ 0, (sy_call_t *)nosys },			/* 140 = adjtime */
-	{ 3, (sy_call_t *)ogetpeername },		/* 141 = ogetpeername */
+	{ AS(ogetpeername_args), (sy_call_t *)ogetpeername },	/* 141 = ogetpeername */
 	{ 0, (sy_call_t *)ogethostid },			/* 142 = ogethostid */
-	{ 1, (sy_call_t *)osethostid },			/* 143 = osethostid */
-	{ 2, (sy_call_t *)osf1_getrlimit },		/* 144 = osf1_getrlimit */
-	{ 2, (sy_call_t *)osf1_setrlimit },		/* 145 = osf1_setrlimit */
+	{ AS(osethostid_args), (sy_call_t *)osethostid },	/* 143 = osethostid */
+	{ AS(osf1_getrlimit_args), (sy_call_t *)osf1_getrlimit },	/* 144 = osf1_getrlimit */
+	{ AS(osf1_setrlimit_args), (sy_call_t *)osf1_setrlimit },	/* 145 = osf1_setrlimit */
 	{ 0, (sy_call_t *)nosys },			/* 146 = old killpg */
 	{ 0, (sy_call_t *)setsid },			/* 147 = setsid */
 	{ 0, (sy_call_t *)nosys },			/* 148 = quotactl */
 	{ 0, (sy_call_t *)oquota },			/* 149 = oquota */
-	{ 3, (sy_call_t *)ogetsockname },		/* 150 = ogetsockname */
+	{ AS(getsockname_args), (sy_call_t *)ogetsockname },	/* 150 = ogetsockname */
 	{ 0, (sy_call_t *)nosys },			/* 151 =  */
 	{ 0, (sy_call_t *)nosys },			/* 152 =  */
 	{ 0, (sy_call_t *)nosys },			/* 153 =  */
 	{ 0, (sy_call_t *)nosys },			/* 154 =  */
 	{ 0, (sy_call_t *)nosys },			/* 155 =  */
-	{ 4, (sy_call_t *)osf1_sigaction },		/* 156 = osf1_sigaction */
+	{ AS(osf1_sigaction_args), (sy_call_t *)osf1_sigaction },	/* 156 = osf1_sigaction */
 	{ 0, (sy_call_t *)nosys },			/* 157 =  */
 	{ 0, (sy_call_t *)nosys },			/* 158 = nfssvc */
-	{ 4, (sy_call_t *)ogetdirentries },		/* 159 = ogetdirentries */
-	{ 3, (sy_call_t *)osf1_statfs },		/* 160 = osf1_statfs */
-	{ 3, (sy_call_t *)osf1_fstatfs },		/* 161 = osf1_fstatfs */
+	{ AS(ogetdirentries_args), (sy_call_t *)ogetdirentries },	/* 159 = ogetdirentries */
+	{ AS(osf1_statfs_args), (sy_call_t *)osf1_statfs },	/* 160 = osf1_statfs */
+	{ AS(osf1_fstatfs_args), (sy_call_t *)osf1_fstatfs },	/* 161 = osf1_fstatfs */
 	{ 0, (sy_call_t *)nosys },			/* 162 =  */
 	{ 0, (sy_call_t *)nosys },			/* 163 = async_daemon */
 	{ 0, (sy_call_t *)nosys },			/* 164 = getfh */
-	{ 2, (sy_call_t *)getdomainname },		/* 165 = getdomainname */
-	{ 2, (sy_call_t *)setdomainname },		/* 166 = setdomainname */
+	{ AS(getdomainname_args), (sy_call_t *)getdomainname },	/* 165 = getdomainname */
+	{ AS(setdomainname_args), (sy_call_t *)setdomainname },	/* 166 = setdomainname */
 	{ 0, (sy_call_t *)nosys },			/* 167 =  */
 	{ 0, (sy_call_t *)nosys },			/* 168 =  */
 	{ 0, (sy_call_t *)nosys },			/* 169 = exportfs */
@@ -216,25 +218,25 @@ struct sysent osf1_sysent[] = {
 	{ 0, (sy_call_t *)nosys },			/* 197 =  */
 	{ 0, (sy_call_t *)nosys },			/* 198 =  */
 	{ 0, (sy_call_t *)nosys },			/* 199 = swapon */
-	{ 3, (sy_call_t *)msgctl },			/* 200 = msgctl */
-	{ 2, (sy_call_t *)msgget },			/* 201 = msgget */
-	{ 5, (sy_call_t *)msgrcv },			/* 202 = msgrcv */
-	{ 4, (sy_call_t *)msgsnd },			/* 203 = msgsnd */
-	{ 4, (sy_call_t *)__semctl },			/* 204 = __semctl */
-	{ 3, (sy_call_t *)semget },			/* 205 = semget */
-	{ 3, (sy_call_t *)semop },			/* 206 = semop */
-	{ 1, (sy_call_t *)uname },			/* 207 = uname */
-	{ 3, (sy_call_t *)lchown },			/* 208 = lchown */
-	{ 3, (sy_call_t *)shmat },			/* 209 = shmat */
-	{ 3, (sy_call_t *)shmctl },			/* 210 = shmctl */
-	{ 1, (sy_call_t *)shmdt },			/* 211 = shmdt */
-	{ 3, (sy_call_t *)shmget },			/* 212 = shmget */
+	{ AS(msgctl_args), (sy_call_t *)msgctl },	/* 200 = msgctl */
+	{ AS(msgget_args), (sy_call_t *)msgget },	/* 201 = msgget */
+	{ AS(msgrcv_args), (sy_call_t *)msgrcv },	/* 202 = msgrcv */
+	{ AS(msgsnd_args), (sy_call_t *)msgsnd },	/* 203 = msgsnd */
+	{ AS(__semctl_args), (sy_call_t *)__semctl },	/* 204 = __semctl */
+	{ AS(semget_args), (sy_call_t *)semget },	/* 205 = semget */
+	{ AS(semop_args), (sy_call_t *)semop },		/* 206 = semop */
+	{ AS(uname_args), (sy_call_t *)uname },		/* 207 = uname */
+	{ AS(lchown_args), (sy_call_t *)lchown },	/* 208 = lchown */
+	{ AS(shmat_args), (sy_call_t *)shmat },		/* 209 = shmat */
+	{ AS(shmctl_args), (sy_call_t *)shmctl },	/* 210 = shmctl */
+	{ AS(shmdt_args), (sy_call_t *)shmdt },		/* 211 = shmdt */
+	{ AS(shmget_args), (sy_call_t *)shmget },	/* 212 = shmget */
 	{ 0, (sy_call_t *)nosys },			/* 213 = mvalid */
 	{ 0, (sy_call_t *)nosys },			/* 214 = getaddressconf */
 	{ 0, (sy_call_t *)nosys },			/* 215 = msleep */
 	{ 0, (sy_call_t *)nosys },			/* 216 = mwakeup */
-	{ 3, (sy_call_t *)osf1_msync },			/* 217 = osf1_msync */
-	{ 2, (sy_call_t *)osf1_signal },		/* 218 = osf1_signal */
+	{ AS(osf1_msync_args), (sy_call_t *)osf1_msync },	/* 217 = osf1_msync */
+	{ AS(osf1_signal_args), (sy_call_t *)osf1_signal },	/* 218 = osf1_signal */
 	{ 0, (sy_call_t *)nosys },			/* 219 = utc gettime */
 	{ 0, (sy_call_t *)nosys },			/* 220 = utc adjtime */
 	{ 0, (sy_call_t *)nosys },			/* 221 =  */
@@ -249,31 +251,31 @@ struct sysent osf1_sysent[] = {
 	{ 0, (sy_call_t *)nosys },			/* 230 =  */
 	{ 0, (sy_call_t *)nosys },			/* 231 =  */
 	{ 0, (sy_call_t *)nosys },			/* 232 =  */
-	{ 1, (sy_call_t *)getpgid },			/* 233 = getpgid */
-	{ 1, (sy_call_t *)getsid },			/* 234 = getsid */
-	{ 2, (sy_call_t *)osf1_sigaltstack },		/* 235 = osf1_sigaltstack */
+	{ AS(getpgid_args), (sy_call_t *)getpgid },	/* 233 = getpgid */
+	{ AS(getsid_args), (sy_call_t *)getsid },	/* 234 = getsid */
+	{ AS(osf1_sigaltstack_args), (sy_call_t *)osf1_sigaltstack },	/* 235 = osf1_sigaltstack */
 	{ 0, (sy_call_t *)nosys },			/* 236 = waitid */
 	{ 0, (sy_call_t *)nosys },			/* 237 = priocntlset */
 	{ 0, (sy_call_t *)nosys },			/* 238 = sigsendset */
 	{ 0, (sy_call_t *)nosys },			/* 239 =  */
 	{ 0, (sy_call_t *)nosys },			/* 240 = msfs_syscall */
-	{ 3, (sy_call_t *)osf1_sysinfo },		/* 241 = osf1_sysinfo */
+	{ AS(osf1_sysinfo_args), (sy_call_t *)osf1_sysinfo },	/* 241 = osf1_sysinfo */
 	{ 0, (sy_call_t *)nosys },			/* 242 = uadmin */
 	{ 0, (sy_call_t *)nosys },			/* 243 = fuser */
-	{ 0, (sy_call_t *)osf1_proplist_syscall },		/* 244 = osf1_proplist_syscall */
-	{ 1, (sy_call_t *)osf1_ntpadjtime },		/* 245 = osf1_ntpadjtime */
-	{ 1, (sy_call_t *)osf1_ntpgettime },		/* 246 = osf1_ntpgettime */
-	{ 2, (sy_call_t *)osf1_pathconf },		/* 247 = osf1_pathconf */
-	{ 2, (sy_call_t *)osf1_fpathconf },		/* 248 = osf1_fpathconf */
+	{ 0, (sy_call_t *)osf1_proplist_syscall },	/* 244 = osf1_proplist_syscall */
+	{ AS(osf1_ntpadjtime_args), (sy_call_t *)osf1_ntpadjtime },	/* 245 = osf1_ntpadjtime */
+	{ AS(osf1_ntpgettime_args), (sy_call_t *)osf1_ntpgettime },	/* 246 = osf1_ntpgettime */
+	{ AS(osf1_pathconf_args), (sy_call_t *)osf1_pathconf },	/* 247 = osf1_pathconf */
+	{ AS(osf1_fpathconf_args), (sy_call_t *)osf1_fpathconf },	/* 248 = osf1_fpathconf */
 	{ 0, (sy_call_t *)nosys },			/* 249 =  */
-	{ 2, (sy_call_t *)osf1_uswitch },		/* 250 = osf1_uswitch */
-	{ 2, (sy_call_t *)osf1_usleep_thread },		/* 251 = osf1_usleep_thread */
+	{ AS(osf1_uswitch_args), (sy_call_t *)osf1_uswitch },	/* 250 = osf1_uswitch */
+	{ AS(osf1_usleep_thread_args), (sy_call_t *)osf1_usleep_thread },	/* 251 = osf1_usleep_thread */
 	{ 0, (sy_call_t *)nosys },			/* 252 = audcntl */
 	{ 0, (sy_call_t *)nosys },			/* 253 = audgen */
 	{ 0, (sy_call_t *)nosys },			/* 254 = sysfs */
 	{ 0, (sy_call_t *)nosys },			/* 255 =  */
-	{ 5, (sy_call_t *)osf1_getsysinfo },		/* 256 = osf1_getsysinfo */
-	{ 5, (sy_call_t *)osf1_setsysinfo },		/* 257 = osf1_setsysinfo */
+	{ AS(osf1_getsysinfo_args), (sy_call_t *)osf1_getsysinfo },	/* 256 = osf1_getsysinfo */
+	{ AS(osf1_setsysinfo_args), (sy_call_t *)osf1_setsysinfo },	/* 257 = osf1_setsysinfo */
 	{ 0, (sy_call_t *)nosys },			/* 258 = afs_syscall */
 	{ 0, (sy_call_t *)nosys },			/* 259 = swapctl */
 	{ 0, (sy_call_t *)nosys },			/* 260 = memcntl */
diff --git a/sys/compat/svr4/svr4_proto.h b/sys/compat/svr4/svr4_proto.h
index 407513a..26b06dd 100644
--- a/sys/compat/svr4/svr4_proto.h
+++ b/sys/compat/svr4/svr4_proto.h
@@ -11,6 +11,8 @@
 
 #include <sys/signal.h>
 
+#include <sys/acl.h>
+
 struct proc;
 
 #define	PAD_(t)	(sizeof(register_t) <= sizeof(t) ? \
diff --git a/sys/compat/svr4/svr4_sysent.c b/sys/compat/svr4/svr4_sysent.c
index 84db78b..34a34cd 100644
--- a/sys/compat/svr4/svr4_sysent.c
+++ b/sys/compat/svr4/svr4_sysent.c
@@ -15,76 +15,78 @@
 #include <svr4/svr4_signal.h>
 #include <svr4/svr4_proto.h>
 
+#define AS(name) (sizeof(struct name) / sizeof(register_t))
+
 /* The casts are bogus but will do for now. */
 struct sysent svr4_sysent[] = {
 	{ 0, (sy_call_t *)nosys },			/* 0 = unused */
-	{ 1, (sy_call_t *)exit },			/* 1 = exit */
+	{ AS(exit_args), (sy_call_t *)exit },		/* 1 = exit */
 	{ 0, (sy_call_t *)fork },			/* 2 = fork */
-	{ 3, (sy_call_t *)read },			/* 3 = read */
-	{ 3, (sy_call_t *)write },			/* 4 = write */
-	{ 3, (sy_call_t *)svr4_sys_open },		/* 5 = svr4_sys_open */
-	{ 1, (sy_call_t *)close },			/* 6 = close */
-	{ 1, (sy_call_t *)svr4_sys_wait },		/* 7 = svr4_sys_wait */
-	{ 2, (sy_call_t *)svr4_sys_creat },		/* 8 = svr4_sys_creat */
-	{ 2, (sy_call_t *)link },			/* 9 = link */
-	{ 1, (sy_call_t *)unlink },			/* 10 = unlink */
-	{ 2, (sy_call_t *)svr4_sys_execv },		/* 11 = svr4_sys_execv */
-	{ 1, (sy_call_t *)chdir },			/* 12 = chdir */
-	{ 1, (sy_call_t *)svr4_sys_time },		/* 13 = svr4_sys_time */
-	{ 3, (sy_call_t *)svr4_sys_mknod },		/* 14 = svr4_sys_mknod */
-	{ 2, (sy_call_t *)chmod },			/* 15 = chmod */
-	{ 3, (sy_call_t *)chown },			/* 16 = chown */
-	{ 1, (sy_call_t *)svr4_sys_break },		/* 17 = svr4_sys_break */
-	{ 2, (sy_call_t *)svr4_sys_stat },		/* 18 = svr4_sys_stat */
-	{ 3, (sy_call_t *)lseek },			/* 19 = lseek */
+	{ AS(read_args), (sy_call_t *)read },		/* 3 = read */
+	{ AS(write_args), (sy_call_t *)write },		/* 4 = write */
+	{ AS(svr4_sys_open_args), (sy_call_t *)svr4_sys_open },	/* 5 = svr4_sys_open */
+	{ AS(close_args), (sy_call_t *)close },		/* 6 = close */
+	{ AS(svr4_sys_wait_args), (sy_call_t *)svr4_sys_wait },	/* 7 = svr4_sys_wait */
+	{ AS(svr4_sys_creat_args), (sy_call_t *)svr4_sys_creat },	/* 8 = svr4_sys_creat */
+	{ AS(link_args), (sy_call_t *)link },		/* 9 = link */
+	{ AS(unlink_args), (sy_call_t *)unlink },	/* 10 = unlink */
+	{ AS(svr4_sys_execv_args), (sy_call_t *)svr4_sys_execv },	/* 11 = svr4_sys_execv */
+	{ AS(chdir_args), (sy_call_t *)chdir },		/* 12 = chdir */
+	{ AS(svr4_sys_time_args), (sy_call_t *)svr4_sys_time },	/* 13 = svr4_sys_time */
+	{ AS(svr4_sys_mknod_args), (sy_call_t *)svr4_sys_mknod },	/* 14 = svr4_sys_mknod */
+	{ AS(chmod_args), (sy_call_t *)chmod },		/* 15 = chmod */
+	{ AS(chown_args), (sy_call_t *)chown },		/* 16 = chown */
+	{ AS(svr4_sys_break_args), (sy_call_t *)svr4_sys_break },	/* 17 = svr4_sys_break */
+	{ AS(svr4_sys_stat_args), (sy_call_t *)svr4_sys_stat },	/* 18 = svr4_sys_stat */
+	{ AS(lseek_args), (sy_call_t *)lseek },		/* 19 = lseek */
 	{ 0, (sy_call_t *)getpid },			/* 20 = getpid */
 	{ 0, (sy_call_t *)nosys },			/* 21 = old_mount */
 	{ 0, (sy_call_t *)nosys },			/* 22 = sysv_umount */
-	{ 1, (sy_call_t *)setuid },			/* 23 = setuid */
+	{ AS(setuid_args), (sy_call_t *)setuid },	/* 23 = setuid */
 	{ 0, (sy_call_t *)getuid },			/* 24 = getuid */
 	{ 0, (sy_call_t *)nosys },			/* 25 = stime */
 	{ 0, (sy_call_t *)nosys },			/* 26 = ptrace */
-	{ 1, (sy_call_t *)svr4_sys_alarm },		/* 27 = svr4_sys_alarm */
-	{ 2, (sy_call_t *)svr4_sys_fstat },		/* 28 = svr4_sys_fstat */
+	{ AS(svr4_sys_alarm_args), (sy_call_t *)svr4_sys_alarm },	/* 27 = svr4_sys_alarm */
+	{ AS(svr4_sys_fstat_args), (sy_call_t *)svr4_sys_fstat },	/* 28 = svr4_sys_fstat */
 	{ 0, (sy_call_t *)svr4_sys_pause },		/* 29 = svr4_sys_pause */
-	{ 2, (sy_call_t *)svr4_sys_utime },		/* 30 = svr4_sys_utime */
+	{ AS(svr4_sys_utime_args), (sy_call_t *)svr4_sys_utime },	/* 30 = svr4_sys_utime */
 	{ 0, (sy_call_t *)nosys },			/* 31 = stty */
 	{ 0, (sy_call_t *)nosys },			/* 32 = gtty */
-	{ 2, (sy_call_t *)svr4_sys_access },		/* 33 = svr4_sys_access */
-	{ 1, (sy_call_t *)svr4_sys_nice },		/* 34 = svr4_sys_nice */
+	{ AS(svr4_sys_access_args), (sy_call_t *)svr4_sys_access },	/* 33 = svr4_sys_access */
+	{ AS(svr4_sys_nice_args), (sy_call_t *)svr4_sys_nice },	/* 34 = svr4_sys_nice */
 	{ 0, (sy_call_t *)nosys },			/* 35 = statfs */
 	{ 0, (sy_call_t *)sync },			/* 36 = sync */
-	{ 2, (sy_call_t *)svr4_sys_kill },		/* 37 = svr4_sys_kill */
+	{ AS(svr4_sys_kill_args), (sy_call_t *)svr4_sys_kill },	/* 37 = svr4_sys_kill */
 	{ 0, (sy_call_t *)nosys },			/* 38 = fstatfs */
-	{ 3, (sy_call_t *)svr4_sys_pgrpsys },		/* 39 = svr4_sys_pgrpsys */
+	{ AS(svr4_sys_pgrpsys_args), (sy_call_t *)svr4_sys_pgrpsys },	/* 39 = svr4_sys_pgrpsys */
 	{ 0, (sy_call_t *)nosys },			/* 40 = xenix */
-	{ 1, (sy_call_t *)dup },			/* 41 = dup */
+	{ AS(dup_args), (sy_call_t *)dup },		/* 41 = dup */
 	{ 0, (sy_call_t *)pipe },			/* 42 = pipe */
-	{ 1, (sy_call_t *)svr4_sys_times },		/* 43 = svr4_sys_times */
+	{ AS(svr4_sys_times_args), (sy_call_t *)svr4_sys_times },	/* 43 = svr4_sys_times */
 	{ 0, (sy_call_t *)nosys },			/* 44 = profil */
 	{ 0, (sy_call_t *)nosys },			/* 45 = plock */
-	{ 1, (sy_call_t *)setgid },			/* 46 = setgid */
+	{ AS(setgid_args), (sy_call_t *)setgid },	/* 46 = setgid */
 	{ 0, (sy_call_t *)getgid },			/* 47 = getgid */
-	{ 2, (sy_call_t *)svr4_sys_signal },		/* 48 = svr4_sys_signal */
+	{ AS(svr4_sys_signal_args), (sy_call_t *)svr4_sys_signal },	/* 48 = svr4_sys_signal */
 #if defined(NOTYET)
-	{ 5, (sy_call_t *)svr4_sys_msgsys },		/* 49 = svr4_sys_msgsys */
+	{ AS(svr4_sys_msgsys_args), (sy_call_t *)svr4_sys_msgsys },	/* 49 = svr4_sys_msgsys */
 #else
 	{ 0, (sy_call_t *)nosys },			/* 49 = msgsys */
 #endif
-	{ 2, (sy_call_t *)svr4_sys_sysarch },		/* 50 = svr4_sys_sysarch */
+	{ AS(svr4_sys_sysarch_args), (sy_call_t *)svr4_sys_sysarch },	/* 50 = svr4_sys_sysarch */
 	{ 0, (sy_call_t *)nosys },			/* 51 = acct */
 	{ 0, (sy_call_t *)nosys },			/* 52 = shmsys */
 	{ 0, (sy_call_t *)nosys },			/* 53 = semsys */
-	{ 3, (sy_call_t *)svr4_sys_ioctl },		/* 54 = svr4_sys_ioctl */
+	{ AS(svr4_sys_ioctl_args), (sy_call_t *)svr4_sys_ioctl },	/* 54 = svr4_sys_ioctl */
 	{ 0, (sy_call_t *)nosys },			/* 55 = uadmin */
 	{ 0, (sy_call_t *)nosys },			/* 56 = exch */
-	{ 4, (sy_call_t *)svr4_sys_utssys },		/* 57 = svr4_sys_utssys */
-	{ 1, (sy_call_t *)fsync },			/* 58 = fsync */
-	{ 3, (sy_call_t *)svr4_sys_execve },		/* 59 = svr4_sys_execve */
-	{ 1, (sy_call_t *)umask },			/* 60 = umask */
-	{ 1, (sy_call_t *)chroot },			/* 61 = chroot */
-	{ 3, (sy_call_t *)svr4_sys_fcntl },		/* 62 = svr4_sys_fcntl */
-	{ 2, (sy_call_t *)svr4_sys_ulimit },		/* 63 = svr4_sys_ulimit */
+	{ AS(svr4_sys_utssys_args), (sy_call_t *)svr4_sys_utssys },	/* 57 = svr4_sys_utssys */
+	{ AS(fsync_args), (sy_call_t *)fsync },		/* 58 = fsync */
+	{ AS(svr4_sys_execve_args), (sy_call_t *)svr4_sys_execve },	/* 59 = svr4_sys_execve */
+	{ AS(umask_args), (sy_call_t *)umask },		/* 60 = umask */
+	{ AS(chroot_args), (sy_call_t *)chroot },	/* 61 = chroot */
+	{ AS(svr4_sys_fcntl_args), (sy_call_t *)svr4_sys_fcntl },	/* 62 = svr4_sys_fcntl */
+	{ AS(svr4_sys_ulimit_args), (sy_call_t *)svr4_sys_ulimit },	/* 63 = svr4_sys_ulimit */
 	{ 0, (sy_call_t *)nosys },			/* 64 = reserved */
 	{ 0, (sy_call_t *)nosys },			/* 65 = reserved */
 	{ 0, (sy_call_t *)nosys },			/* 66 = reserved */
@@ -100,69 +102,69 @@ struct sysent svr4_sysent[] = {
 	{ 0, (sy_call_t *)nosys },			/* 76 = rdebug */
 	{ 0, (sy_call_t *)nosys },			/* 77 = rfstop */
 	{ 0, (sy_call_t *)nosys },			/* 78 = rfsys */
-	{ 1, (sy_call_t *)rmdir },			/* 79 = rmdir */
-	{ 2, (sy_call_t *)mkdir },			/* 80 = mkdir */
-	{ 3, (sy_call_t *)svr4_sys_getdents },		/* 81 = svr4_sys_getdents */
+	{ AS(rmdir_args), (sy_call_t *)rmdir },		/* 79 = rmdir */
+	{ AS(mkdir_args), (sy_call_t *)mkdir },		/* 80 = mkdir */
+	{ AS(svr4_sys_getdents_args), (sy_call_t *)svr4_sys_getdents },	/* 81 = svr4_sys_getdents */
 	{ 0, (sy_call_t *)nosys },			/* 82 = libattach */
 	{ 0, (sy_call_t *)nosys },			/* 83 = libdetach */
 	{ 0, (sy_call_t *)nosys },			/* 84 = sysfs */
-	{ 4, (sy_call_t *)svr4_sys_getmsg },		/* 85 = svr4_sys_getmsg */
-	{ 4, (sy_call_t *)svr4_sys_putmsg },		/* 86 = svr4_sys_putmsg */
-	{ 3, (sy_call_t *)svr4_sys_poll },		/* 87 = svr4_sys_poll */
-	{ 2, (sy_call_t *)svr4_sys_lstat },		/* 88 = svr4_sys_lstat */
-	{ 2, (sy_call_t *)symlink },			/* 89 = symlink */
-	{ 3, (sy_call_t *)readlink },			/* 90 = readlink */
-	{ 2, (sy_call_t *)getgroups },			/* 91 = getgroups */
-	{ 2, (sy_call_t *)setgroups },			/* 92 = setgroups */
-	{ 2, (sy_call_t *)fchmod },			/* 93 = fchmod */
-	{ 3, (sy_call_t *)fchown },			/* 94 = fchown */
-	{ 3, (sy_call_t *)svr4_sys_sigprocmask },		/* 95 = svr4_sys_sigprocmask */
-	{ 1, (sy_call_t *)svr4_sys_sigsuspend },		/* 96 = svr4_sys_sigsuspend */
-	{ 2, (sy_call_t *)svr4_sys_sigaltstack },		/* 97 = svr4_sys_sigaltstack */
-	{ 3, (sy_call_t *)svr4_sys_sigaction },		/* 98 = svr4_sys_sigaction */
-	{ 2, (sy_call_t *)svr4_sys_sigpending },		/* 99 = svr4_sys_sigpending */
-	{ 2, (sy_call_t *)svr4_sys_context },		/* 100 = svr4_sys_context */
+	{ AS(svr4_sys_getmsg_args), (sy_call_t *)svr4_sys_getmsg },	/* 85 = svr4_sys_getmsg */
+	{ AS(svr4_sys_putmsg_args), (sy_call_t *)svr4_sys_putmsg },	/* 86 = svr4_sys_putmsg */
+	{ AS(svr4_sys_poll_args), (sy_call_t *)svr4_sys_poll },	/* 87 = svr4_sys_poll */
+	{ AS(svr4_sys_lstat_args), (sy_call_t *)svr4_sys_lstat },	/* 88 = svr4_sys_lstat */
+	{ AS(symlink_args), (sy_call_t *)symlink },	/* 89 = symlink */
+	{ AS(readlink_args), (sy_call_t *)readlink },	/* 90 = readlink */
+	{ AS(getgroups_args), (sy_call_t *)getgroups },	/* 91 = getgroups */
+	{ AS(setgroups_args), (sy_call_t *)setgroups },	/* 92 = setgroups */
+	{ AS(fchmod_args), (sy_call_t *)fchmod },	/* 93 = fchmod */
+	{ AS(fchown_args), (sy_call_t *)fchown },	/* 94 = fchown */
+	{ AS(svr4_sys_sigprocmask_args), (sy_call_t *)svr4_sys_sigprocmask },	/* 95 = svr4_sys_sigprocmask */
+	{ AS(svr4_sys_sigsuspend_args), (sy_call_t *)svr4_sys_sigsuspend },	/* 96 = svr4_sys_sigsuspend */
+	{ AS(svr4_sys_sigaltstack_args), (sy_call_t *)svr4_sys_sigaltstack },	/* 97 = svr4_sys_sigaltstack */
+	{ AS(svr4_sys_sigaction_args), (sy_call_t *)svr4_sys_sigaction },	/* 98 = svr4_sys_sigaction */
+	{ AS(svr4_sys_sigpending_args), (sy_call_t *)svr4_sys_sigpending },	/* 99 = svr4_sys_sigpending */
+	{ AS(svr4_sys_context_args), (sy_call_t *)svr4_sys_context },	/* 100 = svr4_sys_context */
 	{ 0, (sy_call_t *)nosys },			/* 101 = evsys */
 	{ 0, (sy_call_t *)nosys },			/* 102 = evtrapret */
-	{ 2, (sy_call_t *)svr4_sys_statvfs },		/* 103 = svr4_sys_statvfs */
-	{ 2, (sy_call_t *)svr4_sys_fstatvfs },		/* 104 = svr4_sys_fstatvfs */
+	{ AS(svr4_sys_statvfs_args), (sy_call_t *)svr4_sys_statvfs },	/* 103 = svr4_sys_statvfs */
+	{ AS(svr4_sys_fstatvfs_args), (sy_call_t *)svr4_sys_fstatvfs },	/* 104 = svr4_sys_fstatvfs */
 	{ 0, (sy_call_t *)nosys },			/* 105 = whoknows */
 	{ 0, (sy_call_t *)nosys },			/* 106 = nfssvc */
-	{ 4, (sy_call_t *)svr4_sys_waitsys },		/* 107 = svr4_sys_waitsys */
+	{ AS(svr4_sys_waitsys_args), (sy_call_t *)svr4_sys_waitsys },	/* 107 = svr4_sys_waitsys */
 	{ 0, (sy_call_t *)nosys },			/* 108 = sigsendsys */
-	{ 5, (sy_call_t *)svr4_sys_hrtsys },		/* 109 = svr4_sys_hrtsys */
+	{ AS(svr4_sys_hrtsys_args), (sy_call_t *)svr4_sys_hrtsys },	/* 109 = svr4_sys_hrtsys */
 	{ 0, (sy_call_t *)nosys },			/* 110 = acancel */
 	{ 0, (sy_call_t *)nosys },			/* 111 = async */
 	{ 0, (sy_call_t *)nosys },			/* 112 = priocntlsys */
-	{ 2, (sy_call_t *)svr4_sys_pathconf },		/* 113 = svr4_sys_pathconf */
+	{ AS(svr4_sys_pathconf_args), (sy_call_t *)svr4_sys_pathconf },	/* 113 = svr4_sys_pathconf */
 	{ 0, (sy_call_t *)nosys },			/* 114 = mincore */
-	{ 6, (sy_call_t *)svr4_sys_mmap },		/* 115 = svr4_sys_mmap */
-	{ 3, (sy_call_t *)mprotect },			/* 116 = mprotect */
-	{ 2, (sy_call_t *)munmap },			/* 117 = munmap */
-	{ 2, (sy_call_t *)svr4_sys_fpathconf },		/* 118 = svr4_sys_fpathconf */
+	{ AS(svr4_sys_mmap_args), (sy_call_t *)svr4_sys_mmap },	/* 115 = svr4_sys_mmap */
+	{ AS(mprotect_args), (sy_call_t *)mprotect },	/* 116 = mprotect */
+	{ AS(munmap_args), (sy_call_t *)munmap },	/* 117 = munmap */
+	{ AS(svr4_sys_fpathconf_args), (sy_call_t *)svr4_sys_fpathconf },	/* 118 = svr4_sys_fpathconf */
 	{ 0, (sy_call_t *)vfork },			/* 119 = vfork */
-	{ 1, (sy_call_t *)fchdir },			/* 120 = fchdir */
-	{ 3, (sy_call_t *)readv },			/* 121 = readv */
-	{ 3, (sy_call_t *)writev },			/* 122 = writev */
-	{ 3, (sy_call_t *)svr4_sys_xstat },		/* 123 = svr4_sys_xstat */
-	{ 3, (sy_call_t *)svr4_sys_lxstat },		/* 124 = svr4_sys_lxstat */
-	{ 3, (sy_call_t *)svr4_sys_fxstat },		/* 125 = svr4_sys_fxstat */
-	{ 4, (sy_call_t *)svr4_sys_xmknod },		/* 126 = svr4_sys_xmknod */
+	{ AS(fchdir_args), (sy_call_t *)fchdir },	/* 120 = fchdir */
+	{ AS(readv_args), (sy_call_t *)readv },		/* 121 = readv */
+	{ AS(writev_args), (sy_call_t *)writev },	/* 122 = writev */
+	{ AS(svr4_sys_xstat_args), (sy_call_t *)svr4_sys_xstat },	/* 123 = svr4_sys_xstat */
+	{ AS(svr4_sys_lxstat_args), (sy_call_t *)svr4_sys_lxstat },	/* 124 = svr4_sys_lxstat */
+	{ AS(svr4_sys_fxstat_args), (sy_call_t *)svr4_sys_fxstat },	/* 125 = svr4_sys_fxstat */
+	{ AS(svr4_sys_xmknod_args), (sy_call_t *)svr4_sys_xmknod },	/* 126 = svr4_sys_xmknod */
 	{ 0, (sy_call_t *)nosys },			/* 127 = clocal */
-	{ 2, (sy_call_t *)svr4_sys_setrlimit },		/* 128 = svr4_sys_setrlimit */
-	{ 2, (sy_call_t *)svr4_sys_getrlimit },		/* 129 = svr4_sys_getrlimit */
-	{ 3, (sy_call_t *)lchown },			/* 130 = lchown */
-	{ 6, (sy_call_t *)svr4_sys_memcntl },		/* 131 = svr4_sys_memcntl */
+	{ AS(svr4_sys_setrlimit_args), (sy_call_t *)svr4_sys_setrlimit },	/* 128 = svr4_sys_setrlimit */
+	{ AS(svr4_sys_getrlimit_args), (sy_call_t *)svr4_sys_getrlimit },	/* 129 = svr4_sys_getrlimit */
+	{ AS(lchown_args), (sy_call_t *)lchown },	/* 130 = lchown */
+	{ AS(svr4_sys_memcntl_args), (sy_call_t *)svr4_sys_memcntl },	/* 131 = svr4_sys_memcntl */
 	{ 0, (sy_call_t *)nosys },			/* 132 = getpmsg */
 	{ 0, (sy_call_t *)nosys },			/* 133 = putpmsg */
-	{ 2, (sy_call_t *)rename },			/* 134 = rename */
-	{ 2, (sy_call_t *)svr4_sys_uname },		/* 135 = svr4_sys_uname */
-	{ 1, (sy_call_t *)setegid },			/* 136 = setegid */
-	{ 1, (sy_call_t *)svr4_sys_sysconfig },		/* 137 = svr4_sys_sysconfig */
-	{ 2, (sy_call_t *)adjtime },			/* 138 = adjtime */
-	{ 3, (sy_call_t *)svr4_sys_systeminfo },		/* 139 = svr4_sys_systeminfo */
+	{ AS(rename_args), (sy_call_t *)rename },	/* 134 = rename */
+	{ AS(svr4_sys_uname_args), (sy_call_t *)svr4_sys_uname },	/* 135 = svr4_sys_uname */
+	{ AS(setegid_args), (sy_call_t *)setegid },	/* 136 = setegid */
+	{ AS(svr4_sys_sysconfig_args), (sy_call_t *)svr4_sys_sysconfig },	/* 137 = svr4_sys_sysconfig */
+	{ AS(adjtime_args), (sy_call_t *)adjtime },	/* 138 = adjtime */
+	{ AS(svr4_sys_systeminfo_args), (sy_call_t *)svr4_sys_systeminfo },	/* 139 = svr4_sys_systeminfo */
 	{ 0, (sy_call_t *)nosys },			/* 140 = notused */
-	{ 1, (sy_call_t *)seteuid },			/* 141 = seteuid */
+	{ AS(seteuid_args), (sy_call_t *)seteuid },	/* 141 = seteuid */
 	{ 0, (sy_call_t *)nosys },			/* 142 = vtrace */
 	{ 0, (sy_call_t *)nosys },			/* 143 = { */
 	{ 0, (sy_call_t *)nosys },			/* 144 = sigtimedwait */
@@ -174,12 +176,12 @@ struct sysent svr4_sysent[] = {
 	{ 0, (sy_call_t *)nosys },			/* 150 = notused */
 	{ 0, (sy_call_t *)nosys },			/* 151 = notused */
 	{ 0, (sy_call_t *)nosys },			/* 152 = modctl */
-	{ 1, (sy_call_t *)svr4_sys_fchroot },		/* 153 = svr4_sys_fchroot */
-	{ 2, (sy_call_t *)svr4_sys_utimes },		/* 154 = svr4_sys_utimes */
+	{ AS(svr4_sys_fchroot_args), (sy_call_t *)svr4_sys_fchroot },	/* 153 = svr4_sys_fchroot */
+	{ AS(svr4_sys_utimes_args), (sy_call_t *)svr4_sys_utimes },	/* 154 = svr4_sys_utimes */
 	{ 0, (sy_call_t *)svr4_sys_vhangup },		/* 155 = svr4_sys_vhangup */
-	{ 1, (sy_call_t *)svr4_sys_gettimeofday },		/* 156 = svr4_sys_gettimeofday */
-	{ 2, (sy_call_t *)getitimer },			/* 157 = getitimer */
-	{ 3, (sy_call_t *)setitimer },			/* 158 = setitimer */
+	{ AS(svr4_sys_gettimeofday_args), (sy_call_t *)svr4_sys_gettimeofday },	/* 156 = svr4_sys_gettimeofday */
+	{ AS(getitimer_args), (sy_call_t *)getitimer },	/* 157 = getitimer */
+	{ AS(setitimer_args), (sy_call_t *)setitimer },	/* 158 = setitimer */
 	{ 0, (sy_call_t *)nosys },			/* 159 = lwp_create */
 	{ 0, (sy_call_t *)nosys },			/* 160 = lwp_exit */
 	{ 0, (sy_call_t *)nosys },			/* 161 = lwp_suspend */
@@ -196,7 +198,7 @@ struct sysent svr4_sysent[] = {
 	{ 0, (sy_call_t *)nosys },			/* 172 = lwp_cond_broadcast */
 	{ 0, (sy_call_t *)nosys },			/* 173 = { */
 	{ 0, (sy_call_t *)nosys },			/* 174 = { */
-	{ 4, (sy_call_t *)svr4_sys_llseek },		/* 175 = svr4_sys_llseek */
+	{ AS(svr4_sys_llseek_args), (sy_call_t *)svr4_sys_llseek },	/* 175 = svr4_sys_llseek */
 	{ 0, (sy_call_t *)nosys },			/* 176 = inst_sync */
 	{ 0, (sy_call_t *)nosys },			/* 177 = whoknows */
 	{ 0, (sy_call_t *)nosys },			/* 178 = kaio */
@@ -206,8 +208,8 @@ struct sysent svr4_sysent[] = {
 	{ 0, (sy_call_t *)nosys },			/* 182 = whoknows */
 	{ 0, (sy_call_t *)nosys },			/* 183 = whoknows */
 	{ 0, (sy_call_t *)nosys },			/* 184 = tsolsys */
-	{ 4, (sy_call_t *)svr4_sys_acl },		/* 185 = svr4_sys_acl */
-	{ 6, (sy_call_t *)svr4_sys_auditsys },		/* 186 = svr4_sys_auditsys */
+	{ AS(svr4_sys_acl_args), (sy_call_t *)svr4_sys_acl },	/* 185 = svr4_sys_acl */
+	{ AS(svr4_sys_auditsys_args), (sy_call_t *)svr4_sys_auditsys },	/* 186 = svr4_sys_auditsys */
 	{ 0, (sy_call_t *)nosys },			/* 187 = processor_bind */
 	{ 0, (sy_call_t *)nosys },			/* 188 = processor_info */
 	{ 0, (sy_call_t *)nosys },			/* 189 = p_online */
@@ -220,54 +222,54 @@ struct sysent svr4_sysent[] = {
 	{ 0, (sy_call_t *)nosys },			/* 196 = timer_settime */
 	{ 0, (sy_call_t *)nosys },			/* 197 = timer_gettime */
 	{ 0, (sy_call_t *)nosys },			/* 198 = timer_overrun */
-	{ 2, (sy_call_t *)nanosleep },			/* 199 = nanosleep */
-	{ 4, (sy_call_t *)svr4_sys_facl },		/* 200 = svr4_sys_facl */
+	{ AS(nanosleep_args), (sy_call_t *)nanosleep },	/* 199 = nanosleep */
+	{ AS(svr4_sys_facl_args), (sy_call_t *)svr4_sys_facl },	/* 200 = svr4_sys_facl */
 	{ 0, (sy_call_t *)nosys },			/* 201 = door */
-	{ 2, (sy_call_t *)setreuid },			/* 202 = setreuid */
-	{ 2, (sy_call_t *)setregid },			/* 203 = setregid */
+	{ AS(setreuid_args), (sy_call_t *)setreuid },	/* 202 = setreuid */
+	{ AS(setregid_args), (sy_call_t *)setregid },	/* 203 = setregid */
 	{ 0, (sy_call_t *)nosys },			/* 204 = install_utrap */
 	{ 0, (sy_call_t *)nosys },			/* 205 = signotify */
 	{ 0, (sy_call_t *)nosys },			/* 206 = schedctl */
 	{ 0, (sy_call_t *)nosys },			/* 207 = pset */
 	{ 0, (sy_call_t *)nosys },			/* 208 = whoknows */
-	{ 3, (sy_call_t *)svr4_sys_resolvepath },		/* 209 = svr4_sys_resolvepath */
+	{ AS(svr4_sys_resolvepath_args), (sy_call_t *)svr4_sys_resolvepath },	/* 209 = svr4_sys_resolvepath */
 	{ 0, (sy_call_t *)nosys },			/* 210 = signotifywait */
 	{ 0, (sy_call_t *)nosys },			/* 211 = lwp_sigredirect */
 	{ 0, (sy_call_t *)nosys },			/* 212 = lwp_alarm */
-	{ 3, (sy_call_t *)svr4_sys_getdents64 },		/* 213 = svr4_sys_getdents64 */
-	{ 6, (sy_call_t *)svr4_sys_mmap64 },		/* 214 = svr4_sys_mmap64 */
-	{ 2, (sy_call_t *)svr4_sys_stat64 },		/* 215 = svr4_sys_stat64 */
-	{ 2, (sy_call_t *)svr4_sys_lstat64 },		/* 216 = svr4_sys_lstat64 */
-	{ 2, (sy_call_t *)svr4_sys_fstat64 },		/* 217 = svr4_sys_fstat64 */
-	{ 2, (sy_call_t *)svr4_sys_statvfs64 },		/* 218 = svr4_sys_statvfs64 */
-	{ 2, (sy_call_t *)svr4_sys_fstatvfs64 },		/* 219 = svr4_sys_fstatvfs64 */
-	{ 2, (sy_call_t *)svr4_sys_setrlimit64 },		/* 220 = svr4_sys_setrlimit64 */
-	{ 2, (sy_call_t *)svr4_sys_getrlimit64 },		/* 221 = svr4_sys_getrlimit64 */
+	{ AS(svr4_sys_getdents64_args), (sy_call_t *)svr4_sys_getdents64 },	/* 213 = svr4_sys_getdents64 */
+	{ AS(svr4_sys_mmap64_args), (sy_call_t *)svr4_sys_mmap64 },	/* 214 = svr4_sys_mmap64 */
+	{ AS(svr4_sys_stat64_args), (sy_call_t *)svr4_sys_stat64 },	/* 215 = svr4_sys_stat64 */
+	{ AS(svr4_sys_lstat64_args), (sy_call_t *)svr4_sys_lstat64 },	/* 216 = svr4_sys_lstat64 */
+	{ AS(svr4_sys_fstat64_args), (sy_call_t *)svr4_sys_fstat64 },	/* 217 = svr4_sys_fstat64 */
+	{ AS(svr4_sys_statvfs64_args), (sy_call_t *)svr4_sys_statvfs64 },	/* 218 = svr4_sys_statvfs64 */
+	{ AS(svr4_sys_fstatvfs64_args), (sy_call_t *)svr4_sys_fstatvfs64 },	/* 219 = svr4_sys_fstatvfs64 */
+	{ AS(svr4_sys_setrlimit64_args), (sy_call_t *)svr4_sys_setrlimit64 },	/* 220 = svr4_sys_setrlimit64 */
+	{ AS(svr4_sys_getrlimit64_args), (sy_call_t *)svr4_sys_getrlimit64 },	/* 221 = svr4_sys_getrlimit64 */
 	{ 0, (sy_call_t *)nosys },			/* 222 = pread64 */
 	{ 0, (sy_call_t *)nosys },			/* 223 = pwrite64 */
-	{ 2, (sy_call_t *)svr4_sys_creat64 },		/* 224 = svr4_sys_creat64 */
-	{ 3, (sy_call_t *)svr4_sys_open64 },		/* 225 = svr4_sys_open64 */
+	{ AS(svr4_sys_creat64_args), (sy_call_t *)svr4_sys_creat64 },	/* 224 = svr4_sys_creat64 */
+	{ AS(svr4_sys_open64_args), (sy_call_t *)svr4_sys_open64 },	/* 225 = svr4_sys_open64 */
 	{ 0, (sy_call_t *)nosys },			/* 226 = rpcsys */
 	{ 0, (sy_call_t *)nosys },			/* 227 = whoknows */
 	{ 0, (sy_call_t *)nosys },			/* 228 = whoknows */
 	{ 0, (sy_call_t *)nosys },			/* 229 = whoknows */
-	{ 3, (sy_call_t *)svr4_sys_socket },		/* 230 = svr4_sys_socket */
-	{ 4, (sy_call_t *)socketpair },			/* 231 = socketpair */
-	{ 3, (sy_call_t *)bind },			/* 232 = bind */
-	{ 2, (sy_call_t *)listen },			/* 233 = listen */
-	{ 3, (sy_call_t *)accept },			/* 234 = accept */
-	{ 3, (sy_call_t *)connect },			/* 235 = connect */
-	{ 2, (sy_call_t *)shutdown },			/* 236 = shutdown */
-	{ 4, (sy_call_t *)svr4_sys_recv },		/* 237 = svr4_sys_recv */
-	{ 6, (sy_call_t *)recvfrom },			/* 238 = recvfrom */
-	{ 3, (sy_call_t *)recvmsg },			/* 239 = recvmsg */
-	{ 4, (sy_call_t *)svr4_sys_send },		/* 240 = svr4_sys_send */
-	{ 3, (sy_call_t *)sendmsg },			/* 241 = sendmsg */
-	{ 6, (sy_call_t *)svr4_sys_sendto },		/* 242 = svr4_sys_sendto */
-	{ 3, (sy_call_t *)getpeername },		/* 243 = getpeername */
-	{ 3, (sy_call_t *)getsockname },		/* 244 = getsockname */
-	{ 5, (sy_call_t *)getsockopt },			/* 245 = getsockopt */
-	{ 5, (sy_call_t *)setsockopt },			/* 246 = setsockopt */
+	{ AS(svr4_sys_socket_args), (sy_call_t *)svr4_sys_socket },	/* 230 = svr4_sys_socket */
+	{ AS(socketpair_args), (sy_call_t *)socketpair },	/* 231 = socketpair */
+	{ AS(bind_args), (sy_call_t *)bind },		/* 232 = bind */
+	{ AS(listen_args), (sy_call_t *)listen },	/* 233 = listen */
+	{ AS(accept_args), (sy_call_t *)accept },	/* 234 = accept */
+	{ AS(connect_args), (sy_call_t *)connect },	/* 235 = connect */
+	{ AS(shutdown_args), (sy_call_t *)shutdown },	/* 236 = shutdown */
+	{ AS(svr4_sys_recv_args), (sy_call_t *)svr4_sys_recv },	/* 237 = svr4_sys_recv */
+	{ AS(recvfrom_args), (sy_call_t *)recvfrom },	/* 238 = recvfrom */
+	{ AS(recvmsg_args), (sy_call_t *)recvmsg },	/* 239 = recvmsg */
+	{ AS(svr4_sys_send_args), (sy_call_t *)svr4_sys_send },	/* 240 = svr4_sys_send */
+	{ AS(sendmsg_args), (sy_call_t *)sendmsg },	/* 241 = sendmsg */
+	{ AS(svr4_sys_sendto_args), (sy_call_t *)svr4_sys_sendto },	/* 242 = svr4_sys_sendto */
+	{ AS(getpeername_args), (sy_call_t *)getpeername },	/* 243 = getpeername */
+	{ AS(getsockname_args), (sy_call_t *)getsockname },	/* 244 = getsockname */
+	{ AS(getsockopt_args), (sy_call_t *)getsockopt },	/* 245 = getsockopt */
+	{ AS(setsockopt_args), (sy_call_t *)setsockopt },	/* 246 = setsockopt */
 	{ 0, (sy_call_t *)nosys },			/* 247 = sockconfig */
 	{ 0, (sy_call_t *)nosys },			/* 248 = { */
 	{ 0, (sy_call_t *)nosys },			/* 249 = { */
diff --git a/sys/i386/ibcs2/ibcs2_isc_syscall.h b/sys/i386/ibcs2/ibcs2_isc_syscall.h
index 88ed846..3ad2bae 100644
--- a/sys/i386/ibcs2/ibcs2_isc_syscall.h
+++ b/sys/i386/ibcs2/ibcs2_isc_syscall.h
@@ -2,6 +2,7 @@
  * System call numbers.
  *
  * DO NOT EDIT-- this file is automatically generated.
+ * $FreeBSD$
  * created from FreeBSD: src/sys/i386/ibcs2/syscalls.isc,v 1.5 1999/08/28 00:44:01 peter Exp 
  */
 
diff --git a/sys/i386/ibcs2/ibcs2_isc_sysent.c b/sys/i386/ibcs2/ibcs2_isc_sysent.c
index 2eead68..b20b63c 100644
--- a/sys/i386/ibcs2/ibcs2_isc_sysent.c
+++ b/sys/i386/ibcs2/ibcs2_isc_sysent.c
@@ -2,6 +2,7 @@
  * System call switch table.
  *
  * DO NOT EDIT-- this file is automatically generated.
+ * $FreeBSD$
  * created from FreeBSD: src/sys/i386/ibcs2/syscalls.isc,v 1.5 1999/08/28 00:44:01 peter Exp 
  */
 
@@ -13,27 +14,29 @@
 #include <i386/ibcs2/ibcs2_proto.h>
 #include <i386/ibcs2/ibcs2_xenix.h>
 
+#define AS(name) (sizeof(struct name) / sizeof(register_t))
+
 /* The casts are bogus but will do for now. */
 struct sysent isc_sysent[] = {
 	{ 0, (sy_call_t *)nosys },			/* 0 = nosys */
 	{ 0, (sy_call_t *)nosys },			/* 1 = isc_setostype */
-	{ 2, (sy_call_t *)ibcs2_rename },		/* 2 = ibcs2_rename */
-	{ 3, (sy_call_t *)ibcs2_sigaction },		/* 3 = ibcs2_sigaction */
-	{ 3, (sy_call_t *)ibcs2_sigprocmask },		/* 4 = ibcs2_sigprocmask */
-	{ 1, (sy_call_t *)ibcs2_sigpending },		/* 5 = ibcs2_sigpending */
-	{ 2, (sy_call_t *)getgroups },			/* 6 = getgroups */
-	{ 2, (sy_call_t *)setgroups },			/* 7 = setgroups */
-	{ 2, (sy_call_t *)ibcs2_pathconf },		/* 8 = ibcs2_pathconf */
-	{ 2, (sy_call_t *)ibcs2_fpathconf },		/* 9 = ibcs2_fpathconf */
+	{ AS(ibcs2_rename_args), (sy_call_t *)ibcs2_rename },	/* 2 = ibcs2_rename */
+	{ AS(ibcs2_sigaction_args), (sy_call_t *)ibcs2_sigaction },	/* 3 = ibcs2_sigaction */
+	{ AS(ibcs2_sigprocmask_args), (sy_call_t *)ibcs2_sigprocmask },	/* 4 = ibcs2_sigprocmask */
+	{ AS(ibcs2_sigpending_args), (sy_call_t *)ibcs2_sigpending },	/* 5 = ibcs2_sigpending */
+	{ AS(getgroups_args), (sy_call_t *)getgroups },	/* 6 = getgroups */
+	{ AS(setgroups_args), (sy_call_t *)setgroups },	/* 7 = setgroups */
+	{ AS(ibcs2_pathconf_args), (sy_call_t *)ibcs2_pathconf },	/* 8 = ibcs2_pathconf */
+	{ AS(ibcs2_fpathconf_args), (sy_call_t *)ibcs2_fpathconf },	/* 9 = ibcs2_fpathconf */
 	{ 0, (sy_call_t *)nosys },			/* 10 = nosys */
-	{ 3, (sy_call_t *)ibcs2_wait },			/* 11 = ibcs2_wait */
+	{ AS(ibcs2_wait_args), (sy_call_t *)ibcs2_wait },	/* 11 = ibcs2_wait */
 	{ 0, (sy_call_t *)setsid },			/* 12 = setsid */
 	{ 0, (sy_call_t *)getpid },			/* 13 = getpid */
 	{ 0, (sy_call_t *)nosys },			/* 14 = isc_adduser */
 	{ 0, (sy_call_t *)nosys },			/* 15 = isc_setuser */
-	{ 1, (sy_call_t *)ibcs2_sysconf },		/* 16 = ibcs2_sysconf */
-	{ 1, (sy_call_t *)ibcs2_sigsuspend },		/* 17 = ibcs2_sigsuspend */
-	{ 2, (sy_call_t *)ibcs2_symlink },		/* 18 = ibcs2_symlink */
-	{ 3, (sy_call_t *)ibcs2_readlink },		/* 19 = ibcs2_readlink */
+	{ AS(ibcs2_sysconf_args), (sy_call_t *)ibcs2_sysconf },	/* 16 = ibcs2_sysconf */
+	{ AS(ibcs2_sigsuspend_args), (sy_call_t *)ibcs2_sigsuspend },	/* 17 = ibcs2_sigsuspend */
+	{ AS(ibcs2_symlink_args), (sy_call_t *)ibcs2_symlink },	/* 18 = ibcs2_symlink */
+	{ AS(ibcs2_readlink_args), (sy_call_t *)ibcs2_readlink },	/* 19 = ibcs2_readlink */
 	{ 0, (sy_call_t *)nosys },			/* 20 = isc_getmajor */
 };
diff --git a/sys/i386/ibcs2/ibcs2_proto.h b/sys/i386/ibcs2/ibcs2_proto.h
index e6bb40e..0907504 100644
--- a/sys/i386/ibcs2/ibcs2_proto.h
+++ b/sys/i386/ibcs2/ibcs2_proto.h
@@ -2,7 +2,8 @@
  * System call prototypes.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from FreeBSD: src/sys/i386/ibcs2/syscalls.master,v 1.9 1999/08/28 00:44:02 peter Exp 
+ * $FreeBSD$
+ * created from FreeBSD: src/sys/i386/ibcs2/syscalls.master,v 1.10 2000/05/09 17:54:30 bde Exp 
  */
 
 #ifndef _IBCS2_SYSPROTO_H_
@@ -10,6 +11,8 @@
 
 #include <sys/signal.h>
 
+#include <sys/acl.h>
+
 struct proc;
 
 #define	PAD_(t)	(sizeof(register_t) <= sizeof(t) ? \
diff --git a/sys/i386/ibcs2/ibcs2_syscall.h b/sys/i386/ibcs2/ibcs2_syscall.h
index 83ce6ab..4c00a1e 100644
--- a/sys/i386/ibcs2/ibcs2_syscall.h
+++ b/sys/i386/ibcs2/ibcs2_syscall.h
@@ -2,7 +2,8 @@
  * System call numbers.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from FreeBSD: src/sys/i386/ibcs2/syscalls.master,v 1.9 1999/08/28 00:44:02 peter Exp 
+ * $FreeBSD$
+ * created from FreeBSD: src/sys/i386/ibcs2/syscalls.master,v 1.10 2000/05/09 17:54:30 bde Exp 
  */
 
 #define	IBCS2_SYS_syscall	0
diff --git a/sys/i386/ibcs2/ibcs2_sysent.c b/sys/i386/ibcs2/ibcs2_sysent.c
index c8e89bb..05a5a9e 100644
--- a/sys/i386/ibcs2/ibcs2_sysent.c
+++ b/sys/i386/ibcs2/ibcs2_sysent.c
@@ -2,7 +2,8 @@
  * System call switch table.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from FreeBSD: src/sys/i386/ibcs2/syscalls.master,v 1.9 1999/08/28 00:44:02 peter Exp 
+ * $FreeBSD$
+ * created from FreeBSD: src/sys/i386/ibcs2/syscalls.master,v 1.10 2000/05/09 17:54:30 bde Exp 
  */
 
 #include <sys/param.h>
@@ -12,72 +13,74 @@
 #include <i386/ibcs2/ibcs2_signal.h>
 #include <i386/ibcs2/ibcs2_proto.h>
 
+#define AS(name) (sizeof(struct name) / sizeof(register_t))
+
 /* The casts are bogus but will do for now. */
 struct sysent ibcs2_sysent[] = {
 	{ 0, (sy_call_t *)nosys },			/* 0 = syscall */
-	{ 1, (sy_call_t *)exit },			/* 1 = exit */
+	{ AS(rexit_args), (sy_call_t *)exit },		/* 1 = exit */
 	{ 0, (sy_call_t *)fork },			/* 2 = fork */
-	{ 3, (sy_call_t *)ibcs2_read },			/* 3 = ibcs2_read */
-	{ 3, (sy_call_t *)write },			/* 4 = write */
-	{ 3, (sy_call_t *)ibcs2_open },			/* 5 = ibcs2_open */
-	{ 1, (sy_call_t *)close },			/* 6 = close */
-	{ 3, (sy_call_t *)ibcs2_wait },			/* 7 = ibcs2_wait */
-	{ 2, (sy_call_t *)ibcs2_creat },		/* 8 = ibcs2_creat */
-	{ 2, (sy_call_t *)link },			/* 9 = link */
-	{ 1, (sy_call_t *)ibcs2_unlink },		/* 10 = ibcs2_unlink */
-	{ 2, (sy_call_t *)ibcs2_execv },		/* 11 = ibcs2_execv */
-	{ 1, (sy_call_t *)ibcs2_chdir },		/* 12 = ibcs2_chdir */
-	{ 1, (sy_call_t *)ibcs2_time },			/* 13 = ibcs2_time */
-	{ 3, (sy_call_t *)ibcs2_mknod },		/* 14 = ibcs2_mknod */
-	{ 2, (sy_call_t *)ibcs2_chmod },		/* 15 = ibcs2_chmod */
-	{ 3, (sy_call_t *)ibcs2_chown },		/* 16 = ibcs2_chown */
-	{ 1, (sy_call_t *)obreak },			/* 17 = obreak */
-	{ 2, (sy_call_t *)ibcs2_stat },			/* 18 = ibcs2_stat */
-	{ 3, (sy_call_t *)ibcs2_lseek },		/* 19 = ibcs2_lseek */
+	{ AS(ibcs2_read_args), (sy_call_t *)ibcs2_read },	/* 3 = ibcs2_read */
+	{ AS(write_args), (sy_call_t *)write },		/* 4 = write */
+	{ AS(ibcs2_open_args), (sy_call_t *)ibcs2_open },	/* 5 = ibcs2_open */
+	{ AS(close_args), (sy_call_t *)close },		/* 6 = close */
+	{ AS(ibcs2_wait_args), (sy_call_t *)ibcs2_wait },	/* 7 = ibcs2_wait */
+	{ AS(ibcs2_creat_args), (sy_call_t *)ibcs2_creat },	/* 8 = ibcs2_creat */
+	{ AS(link_args), (sy_call_t *)link },		/* 9 = link */
+	{ AS(ibcs2_unlink_args), (sy_call_t *)ibcs2_unlink },	/* 10 = ibcs2_unlink */
+	{ AS(ibcs2_execv_args), (sy_call_t *)ibcs2_execv },	/* 11 = ibcs2_execv */
+	{ AS(ibcs2_chdir_args), (sy_call_t *)ibcs2_chdir },	/* 12 = ibcs2_chdir */
+	{ AS(ibcs2_time_args), (sy_call_t *)ibcs2_time },	/* 13 = ibcs2_time */
+	{ AS(ibcs2_mknod_args), (sy_call_t *)ibcs2_mknod },	/* 14 = ibcs2_mknod */
+	{ AS(ibcs2_chmod_args), (sy_call_t *)ibcs2_chmod },	/* 15 = ibcs2_chmod */
+	{ AS(ibcs2_chown_args), (sy_call_t *)ibcs2_chown },	/* 16 = ibcs2_chown */
+	{ AS(obreak_args), (sy_call_t *)obreak },	/* 17 = obreak */
+	{ AS(ibcs2_stat_args), (sy_call_t *)ibcs2_stat },	/* 18 = ibcs2_stat */
+	{ AS(ibcs2_lseek_args), (sy_call_t *)ibcs2_lseek },	/* 19 = ibcs2_lseek */
 	{ 0, (sy_call_t *)getpid },			/* 20 = getpid */
-	{ 6, (sy_call_t *)ibcs2_mount },		/* 21 = ibcs2_mount */
-	{ 1, (sy_call_t *)ibcs2_umount },		/* 22 = ibcs2_umount */
-	{ 1, (sy_call_t *)ibcs2_setuid },		/* 23 = ibcs2_setuid */
+	{ AS(ibcs2_mount_args), (sy_call_t *)ibcs2_mount },	/* 21 = ibcs2_mount */
+	{ AS(ibcs2_umount_args), (sy_call_t *)ibcs2_umount },	/* 22 = ibcs2_umount */
+	{ AS(ibcs2_setuid_args), (sy_call_t *)ibcs2_setuid },	/* 23 = ibcs2_setuid */
 	{ 0, (sy_call_t *)getuid },			/* 24 = getuid */
-	{ 1, (sy_call_t *)ibcs2_stime },		/* 25 = ibcs2_stime */
-	{ 4, (sy_call_t *)ptrace },			/* 26 = ptrace */
-	{ 1, (sy_call_t *)ibcs2_alarm },		/* 27 = ibcs2_alarm */
-	{ 2, (sy_call_t *)ibcs2_fstat },		/* 28 = ibcs2_fstat */
+	{ AS(ibcs2_stime_args), (sy_call_t *)ibcs2_stime },	/* 25 = ibcs2_stime */
+	{ AS(ptrace_args), (sy_call_t *)ptrace },	/* 26 = ptrace */
+	{ AS(ibcs2_alarm_args), (sy_call_t *)ibcs2_alarm },	/* 27 = ibcs2_alarm */
+	{ AS(ibcs2_fstat_args), (sy_call_t *)ibcs2_fstat },	/* 28 = ibcs2_fstat */
 	{ 0, (sy_call_t *)ibcs2_pause },		/* 29 = ibcs2_pause */
-	{ 2, (sy_call_t *)ibcs2_utime },		/* 30 = ibcs2_utime */
-	{ 2, (sy_call_t *)ibcs2_stty },			/* 31 = ibcs2_stty */
-	{ 2, (sy_call_t *)ibcs2_gtty },			/* 32 = ibcs2_gtty */
-	{ 2, (sy_call_t *)ibcs2_access },		/* 33 = ibcs2_access */
-	{ 1, (sy_call_t *)ibcs2_nice },			/* 34 = ibcs2_nice */
-	{ 4, (sy_call_t *)ibcs2_statfs },		/* 35 = ibcs2_statfs */
+	{ AS(ibcs2_utime_args), (sy_call_t *)ibcs2_utime },	/* 30 = ibcs2_utime */
+	{ AS(ibcs2_stty_args), (sy_call_t *)ibcs2_stty },	/* 31 = ibcs2_stty */
+	{ AS(ibcs2_gtty_args), (sy_call_t *)ibcs2_gtty },	/* 32 = ibcs2_gtty */
+	{ AS(ibcs2_access_args), (sy_call_t *)ibcs2_access },	/* 33 = ibcs2_access */
+	{ AS(ibcs2_nice_args), (sy_call_t *)ibcs2_nice },	/* 34 = ibcs2_nice */
+	{ AS(ibcs2_statfs_args), (sy_call_t *)ibcs2_statfs },	/* 35 = ibcs2_statfs */
 	{ 0, (sy_call_t *)sync },			/* 36 = sync */
-	{ 2, (sy_call_t *)ibcs2_kill },			/* 37 = ibcs2_kill */
-	{ 4, (sy_call_t *)ibcs2_fstatfs },		/* 38 = ibcs2_fstatfs */
-	{ 4, (sy_call_t *)ibcs2_pgrpsys },		/* 39 = ibcs2_pgrpsys */
-	{ 5, (sy_call_t *)ibcs2_xenix },		/* 40 = ibcs2_xenix */
-	{ 1, (sy_call_t *)dup },			/* 41 = dup */
+	{ AS(ibcs2_kill_args), (sy_call_t *)ibcs2_kill },	/* 37 = ibcs2_kill */
+	{ AS(ibcs2_fstatfs_args), (sy_call_t *)ibcs2_fstatfs },	/* 38 = ibcs2_fstatfs */
+	{ AS(ibcs2_pgrpsys_args), (sy_call_t *)ibcs2_pgrpsys },	/* 39 = ibcs2_pgrpsys */
+	{ AS(ibcs2_xenix_args), (sy_call_t *)ibcs2_xenix },	/* 40 = ibcs2_xenix */
+	{ AS(dup_args), (sy_call_t *)dup },		/* 41 = dup */
 	{ 0, (sy_call_t *)pipe },			/* 42 = pipe */
-	{ 1, (sy_call_t *)ibcs2_times },		/* 43 = ibcs2_times */
-	{ 4, (sy_call_t *)profil },			/* 44 = profil */
-	{ 1, (sy_call_t *)ibcs2_plock },		/* 45 = ibcs2_plock */
-	{ 1, (sy_call_t *)ibcs2_setgid },		/* 46 = ibcs2_setgid */
+	{ AS(ibcs2_times_args), (sy_call_t *)ibcs2_times },	/* 43 = ibcs2_times */
+	{ AS(profil_args), (sy_call_t *)profil },	/* 44 = profil */
+	{ AS(ibcs2_plock_args), (sy_call_t *)ibcs2_plock },	/* 45 = ibcs2_plock */
+	{ AS(ibcs2_setgid_args), (sy_call_t *)ibcs2_setgid },	/* 46 = ibcs2_setgid */
 	{ 0, (sy_call_t *)getgid },			/* 47 = getgid */
-	{ 2, (sy_call_t *)ibcs2_sigsys },		/* 48 = ibcs2_sigsys */
-	{ 6, (sy_call_t *)ibcs2_msgsys },		/* 49 = ibcs2_msgsys */
-	{ 2, (sy_call_t *)ibcs2_sysi86 },		/* 50 = ibcs2_sysi86 */
+	{ AS(ibcs2_sigsys_args), (sy_call_t *)ibcs2_sigsys },	/* 48 = ibcs2_sigsys */
+	{ AS(ibcs2_msgsys_args), (sy_call_t *)ibcs2_msgsys },	/* 49 = ibcs2_msgsys */
+	{ AS(ibcs2_sysi86_args), (sy_call_t *)ibcs2_sysi86 },	/* 50 = ibcs2_sysi86 */
 	{ 0, (sy_call_t *)nosys },			/* 51 = ibcs2_acct */
-	{ 4, (sy_call_t *)ibcs2_shmsys },		/* 52 = ibcs2_shmsys */
-	{ 5, (sy_call_t *)ibcs2_semsys },		/* 53 = ibcs2_semsys */
-	{ 3, (sy_call_t *)ibcs2_ioctl },		/* 54 = ibcs2_ioctl */
-	{ 3, (sy_call_t *)ibcs2_uadmin },		/* 55 = ibcs2_uadmin */
+	{ AS(ibcs2_shmsys_args), (sy_call_t *)ibcs2_shmsys },	/* 52 = ibcs2_shmsys */
+	{ AS(ibcs2_semsys_args), (sy_call_t *)ibcs2_semsys },	/* 53 = ibcs2_semsys */
+	{ AS(ibcs2_ioctl_args), (sy_call_t *)ibcs2_ioctl },	/* 54 = ibcs2_ioctl */
+	{ AS(ibcs2_uadmin_args), (sy_call_t *)ibcs2_uadmin },	/* 55 = ibcs2_uadmin */
 	{ 0, (sy_call_t *)nosys },			/* 56 = nosys */
-	{ 3, (sy_call_t *)ibcs2_utssys },		/* 57 = ibcs2_utssys */
-	{ 1, (sy_call_t *)fsync },			/* 58 = fsync */
-	{ 3, (sy_call_t *)ibcs2_execve },		/* 59 = ibcs2_execve */
-	{ 1, (sy_call_t *)umask },			/* 60 = umask */
-	{ 1, (sy_call_t *)chroot },			/* 61 = chroot */
-	{ 3, (sy_call_t *)ibcs2_fcntl },		/* 62 = ibcs2_fcntl */
-	{ 2, (sy_call_t *)ibcs2_ulimit },		/* 63 = ibcs2_ulimit */
+	{ AS(ibcs2_utssys_args), (sy_call_t *)ibcs2_utssys },	/* 57 = ibcs2_utssys */
+	{ AS(fsync_args), (sy_call_t *)fsync },		/* 58 = fsync */
+	{ AS(ibcs2_execve_args), (sy_call_t *)ibcs2_execve },	/* 59 = ibcs2_execve */
+	{ AS(umask_args), (sy_call_t *)umask },		/* 60 = umask */
+	{ AS(chroot_args), (sy_call_t *)chroot },	/* 61 = chroot */
+	{ AS(ibcs2_fcntl_args), (sy_call_t *)ibcs2_fcntl },	/* 62 = ibcs2_fcntl */
+	{ AS(ibcs2_ulimit_args), (sy_call_t *)ibcs2_ulimit },	/* 63 = ibcs2_ulimit */
 	{ 0, (sy_call_t *)nosys },			/* 64 = reserved for unix/pc */
 	{ 0, (sy_call_t *)nosys },			/* 65 = reserved for unix/pc */
 	{ 0, (sy_call_t *)nosys },			/* 66 = reserved for unix/pc */
@@ -93,20 +96,20 @@ struct sysent ibcs2_sysent[] = {
 	{ 0, (sy_call_t *)nosys },			/* 76 = obsolete rfs_rdebug */
 	{ 0, (sy_call_t *)nosys },			/* 77 = obsolete rfs_rfstop */
 	{ 0, (sy_call_t *)nosys },			/* 78 = rfs_rfsys */
-	{ 1, (sy_call_t *)ibcs2_rmdir },		/* 79 = ibcs2_rmdir */
-	{ 2, (sy_call_t *)ibcs2_mkdir },		/* 80 = ibcs2_mkdir */
-	{ 3, (sy_call_t *)ibcs2_getdents },		/* 81 = ibcs2_getdents */
+	{ AS(ibcs2_rmdir_args), (sy_call_t *)ibcs2_rmdir },	/* 79 = ibcs2_rmdir */
+	{ AS(ibcs2_mkdir_args), (sy_call_t *)ibcs2_mkdir },	/* 80 = ibcs2_mkdir */
+	{ AS(ibcs2_getdents_args), (sy_call_t *)ibcs2_getdents },	/* 81 = ibcs2_getdents */
 	{ 0, (sy_call_t *)nosys },			/* 82 = nosys */
 	{ 0, (sy_call_t *)nosys },			/* 83 = nosys */
-	{ 3, (sy_call_t *)ibcs2_sysfs },		/* 84 = ibcs2_sysfs */
-	{ 4, (sy_call_t *)ibcs2_getmsg },		/* 85 = ibcs2_getmsg */
-	{ 4, (sy_call_t *)ibcs2_putmsg },		/* 86 = ibcs2_putmsg */
-	{ 3, (sy_call_t *)ibcs2_poll },			/* 87 = ibcs2_poll */
+	{ AS(ibcs2_sysfs_args), (sy_call_t *)ibcs2_sysfs },	/* 84 = ibcs2_sysfs */
+	{ AS(ibcs2_getmsg_args), (sy_call_t *)ibcs2_getmsg },	/* 85 = ibcs2_getmsg */
+	{ AS(ibcs2_putmsg_args), (sy_call_t *)ibcs2_putmsg },	/* 86 = ibcs2_putmsg */
+	{ AS(ibcs2_poll_args), (sy_call_t *)ibcs2_poll },	/* 87 = ibcs2_poll */
 	{ 0, (sy_call_t *)nosys },			/* 88 = nosys */
-	{ 6, (sy_call_t *)ibcs2_secure },		/* 89 = ibcs2_secure */
-	{ 2, (sy_call_t *)ibcs2_symlink },		/* 90 = ibcs2_symlink */
-	{ 2, (sy_call_t *)ibcs2_lstat },		/* 91 = ibcs2_lstat */
-	{ 3, (sy_call_t *)ibcs2_readlink },		/* 92 = ibcs2_readlink */
+	{ AS(ibcs2_secure_args), (sy_call_t *)ibcs2_secure },	/* 89 = ibcs2_secure */
+	{ AS(ibcs2_symlink_args), (sy_call_t *)ibcs2_symlink },	/* 90 = ibcs2_symlink */
+	{ AS(ibcs2_lstat_args), (sy_call_t *)ibcs2_lstat },	/* 91 = ibcs2_lstat */
+	{ AS(ibcs2_readlink_args), (sy_call_t *)ibcs2_readlink },	/* 92 = ibcs2_readlink */
 	{ 0, (sy_call_t *)nosys },			/* 93 = nosys */
 	{ 0, (sy_call_t *)nosys },			/* 94 = nosys */
 	{ 0, (sy_call_t *)nosys },			/* 95 = nosys */
@@ -117,7 +120,7 @@ struct sysent ibcs2_sysent[] = {
 	{ 0, (sy_call_t *)nosys },			/* 100 = nosys */
 	{ 0, (sy_call_t *)nosys },			/* 101 = nosys */
 	{ 0, (sy_call_t *)nosys },			/* 102 = nosys */
-	{ 1, (sy_call_t *)sigreturn },			/* 103 = sigreturn */
+	{ AS(sigreturn_args), (sy_call_t *)sigreturn },	/* 103 = sigreturn */
 	{ 0, (sy_call_t *)nosys },			/* 104 = nosys */
 	{ 0, (sy_call_t *)ibcs2_isc },			/* 105 = ibcs2_isc */
 	{ 0, (sy_call_t *)nosys },			/* 106 = nosys */
diff --git a/sys/i386/ibcs2/ibcs2_xenix.h b/sys/i386/ibcs2/ibcs2_xenix.h
index d15a6fb..3d487ee 100644
--- a/sys/i386/ibcs2/ibcs2_xenix.h
+++ b/sys/i386/ibcs2/ibcs2_xenix.h
@@ -2,6 +2,7 @@
  * System call prototypes.
  *
  * DO NOT EDIT-- this file is automatically generated.
+ * $FreeBSD$
  * created from FreeBSD: src/sys/i386/ibcs2/syscalls.xenix,v 1.6 1999/08/28 00:44:02 peter Exp 
  */
 
@@ -10,6 +11,8 @@
 
 #include <sys/signal.h>
 
+#include <sys/acl.h>
+
 struct proc;
 
 #define	PAD_(t)	(sizeof(register_t) <= sizeof(t) ? \
diff --git a/sys/i386/ibcs2/ibcs2_xenix_syscall.h b/sys/i386/ibcs2/ibcs2_xenix_syscall.h
index a8d2874..2b20d04 100644
--- a/sys/i386/ibcs2/ibcs2_xenix_syscall.h
+++ b/sys/i386/ibcs2/ibcs2_xenix_syscall.h
@@ -2,6 +2,7 @@
  * System call numbers.
  *
  * DO NOT EDIT-- this file is automatically generated.
+ * $FreeBSD$
  * created from FreeBSD: src/sys/i386/ibcs2/syscalls.xenix,v 1.6 1999/08/28 00:44:02 peter Exp 
  */
 
diff --git a/sys/i386/ibcs2/ibcs2_xenix_sysent.c b/sys/i386/ibcs2/ibcs2_xenix_sysent.c
index 66da25a..4cb37b5 100644
--- a/sys/i386/ibcs2/ibcs2_xenix_sysent.c
+++ b/sys/i386/ibcs2/ibcs2_xenix_sysent.c
@@ -2,6 +2,7 @@
  * System call switch table.
  *
  * DO NOT EDIT-- this file is automatically generated.
+ * $FreeBSD$
  * created from FreeBSD: src/sys/i386/ibcs2/syscalls.xenix,v 1.6 1999/08/28 00:44:02 peter Exp 
  */
 
@@ -12,6 +13,8 @@
 #include <i386/ibcs2/ibcs2_signal.h>
 #include <i386/ibcs2/ibcs2_xenix.h>
 
+#define AS(name) (sizeof(struct name) / sizeof(register_t))
+
 /* The casts are bogus but will do for now. */
 struct sysent xenix_sysent[] = {
 	{ 0, (sy_call_t *)nosys },			/* 0 = nosys */
@@ -21,12 +24,12 @@ struct sysent xenix_sysent[] = {
 	{ 0, (sy_call_t *)nosys },			/* 4 = xenix_sigsem */
 	{ 0, (sy_call_t *)nosys },			/* 5 = xenix_waitsem */
 	{ 0, (sy_call_t *)nosys },			/* 6 = xenix_nbwaitsem */
-	{ 1, (sy_call_t *)xenix_rdchk },		/* 7 = xenix_rdchk */
+	{ AS(xenix_rdchk_args), (sy_call_t *)xenix_rdchk },	/* 7 = xenix_rdchk */
 	{ 0, (sy_call_t *)nosys },			/* 8 = nosys */
 	{ 0, (sy_call_t *)nosys },			/* 9 = nosys */
-	{ 2, (sy_call_t *)xenix_chsize },		/* 10 = xenix_chsize */
-	{ 1, (sy_call_t *)xenix_ftime },		/* 11 = xenix_ftime */
-	{ 1, (sy_call_t *)xenix_nap },			/* 12 = xenix_nap */
+	{ AS(xenix_chsize_args), (sy_call_t *)xenix_chsize },	/* 10 = xenix_chsize */
+	{ AS(xenix_ftime_args), (sy_call_t *)xenix_ftime },	/* 11 = xenix_ftime */
+	{ AS(xenix_nap_args), (sy_call_t *)xenix_nap },	/* 12 = xenix_nap */
 	{ 0, (sy_call_t *)nosys },			/* 13 = xenix_sdget */
 	{ 0, (sy_call_t *)nosys },			/* 14 = xenix_sdfree */
 	{ 0, (sy_call_t *)nosys },			/* 15 = xenix_sdenter */
@@ -50,25 +53,25 @@ struct sysent xenix_sysent[] = {
 	{ 0, (sy_call_t *)nosys },			/* 33 = xenix_execseg */
 	{ 0, (sy_call_t *)nosys },			/* 34 = xenix_unexecseg */
 	{ 0, (sy_call_t *)nosys },			/* 35 = nosys */
-	{ 5, (sy_call_t *)select },			/* 36 = select */
-	{ 2, (sy_call_t *)xenix_eaccess },		/* 37 = xenix_eaccess */
+	{ AS(select_args), (sy_call_t *)select },	/* 36 = select */
+	{ AS(xenix_eaccess_args), (sy_call_t *)xenix_eaccess },	/* 37 = xenix_eaccess */
 	{ 0, (sy_call_t *)nosys },			/* 38 = xenix_paccess */
-	{ 3, (sy_call_t *)ibcs2_sigaction },		/* 39 = ibcs2_sigaction */
-	{ 3, (sy_call_t *)ibcs2_sigprocmask },		/* 40 = ibcs2_sigprocmask */
-	{ 1, (sy_call_t *)ibcs2_sigpending },		/* 41 = ibcs2_sigpending */
-	{ 1, (sy_call_t *)ibcs2_sigsuspend },		/* 42 = ibcs2_sigsuspend */
-	{ 2, (sy_call_t *)ibcs2_getgroups },		/* 43 = ibcs2_getgroups */
-	{ 2, (sy_call_t *)ibcs2_setgroups },		/* 44 = ibcs2_setgroups */
-	{ 1, (sy_call_t *)ibcs2_sysconf },		/* 45 = ibcs2_sysconf */
-	{ 2, (sy_call_t *)ibcs2_pathconf },		/* 46 = ibcs2_pathconf */
-	{ 2, (sy_call_t *)ibcs2_fpathconf },		/* 47 = ibcs2_fpathconf */
-	{ 2, (sy_call_t *)ibcs2_rename },		/* 48 = ibcs2_rename */
+	{ AS(ibcs2_sigaction_args), (sy_call_t *)ibcs2_sigaction },	/* 39 = ibcs2_sigaction */
+	{ AS(ibcs2_sigprocmask_args), (sy_call_t *)ibcs2_sigprocmask },	/* 40 = ibcs2_sigprocmask */
+	{ AS(ibcs2_sigpending_args), (sy_call_t *)ibcs2_sigpending },	/* 41 = ibcs2_sigpending */
+	{ AS(ibcs2_sigsuspend_args), (sy_call_t *)ibcs2_sigsuspend },	/* 42 = ibcs2_sigsuspend */
+	{ AS(ibcs2_getgroups_args), (sy_call_t *)ibcs2_getgroups },	/* 43 = ibcs2_getgroups */
+	{ AS(ibcs2_setgroups_args), (sy_call_t *)ibcs2_setgroups },	/* 44 = ibcs2_setgroups */
+	{ AS(ibcs2_sysconf_args), (sy_call_t *)ibcs2_sysconf },	/* 45 = ibcs2_sysconf */
+	{ AS(ibcs2_pathconf_args), (sy_call_t *)ibcs2_pathconf },	/* 46 = ibcs2_pathconf */
+	{ AS(ibcs2_fpathconf_args), (sy_call_t *)ibcs2_fpathconf },	/* 47 = ibcs2_fpathconf */
+	{ AS(ibcs2_rename_args), (sy_call_t *)ibcs2_rename },	/* 48 = ibcs2_rename */
 	{ 0, (sy_call_t *)nosys },			/* 49 = nosys */
-	{ 1, (sy_call_t *)xenix_utsname },		/* 50 = xenix_utsname */
+	{ AS(xenix_utsname_args), (sy_call_t *)xenix_utsname },	/* 50 = xenix_utsname */
 	{ 0, (sy_call_t *)nosys },			/* 51 = nosys */
 	{ 0, (sy_call_t *)nosys },			/* 52 = nosys */
 	{ 0, (sy_call_t *)nosys },			/* 53 = nosys */
 	{ 0, (sy_call_t *)nosys },			/* 54 = nosys */
-	{ 2, (sy_call_t *)getitimer },			/* 55 = getitimer */
-	{ 3, (sy_call_t *)setitimer },			/* 56 = setitimer */
+	{ AS(getitimer_args), (sy_call_t *)getitimer },	/* 55 = getitimer */
+	{ AS(setitimer_args), (sy_call_t *)setitimer },	/* 56 = setitimer */
 };
diff --git a/sys/i386/linux/linux_proto.h b/sys/i386/linux/linux_proto.h
index 4293772..c104936 100644
--- a/sys/i386/linux/linux_proto.h
+++ b/sys/i386/linux/linux_proto.h
@@ -3,7 +3,7 @@
  *
  * DO NOT EDIT-- this file is automatically generated.
  * $FreeBSD$
- * created from FreeBSD: src/sys/i386/linux/syscalls.master,v 1.30 2000/01/29 12:43:29 peter Exp 
+ * created from FreeBSD: src/sys/i386/linux/syscalls.master,v 1.31 2000/05/09 18:23:16 bde Exp 
  */
 
 #ifndef _LINUX_SYSPROTO_H_
diff --git a/sys/i386/linux/linux_syscall.h b/sys/i386/linux/linux_syscall.h
index f050542..d296817 100644
--- a/sys/i386/linux/linux_syscall.h
+++ b/sys/i386/linux/linux_syscall.h
@@ -3,7 +3,7 @@
  *
  * DO NOT EDIT-- this file is automatically generated.
  * $FreeBSD$
- * created from FreeBSD: src/sys/i386/linux/syscalls.master,v 1.30 2000/01/29 12:43:29 peter Exp 
+ * created from FreeBSD: src/sys/i386/linux/syscalls.master,v 1.31 2000/05/09 18:23:16 bde Exp 
  */
 
 #define	LINUX_SYS_linux_setup	0
diff --git a/sys/i386/linux/linux_sysent.c b/sys/i386/linux/linux_sysent.c
index d903bdf..60fb5c6 100644
--- a/sys/i386/linux/linux_sysent.c
+++ b/sys/i386/linux/linux_sysent.c
@@ -3,7 +3,7 @@
  *
  * DO NOT EDIT-- this file is automatically generated.
  * $FreeBSD$
- * created from FreeBSD: src/sys/i386/linux/syscalls.master,v 1.30 2000/01/29 12:43:29 peter Exp 
+ * created from FreeBSD: src/sys/i386/linux/syscalls.master,v 1.31 2000/05/09 18:23:16 bde Exp 
  */
 
 #include "opt_compat.h"
@@ -13,195 +13,197 @@
 #include <i386/linux/linux.h>
 #include <i386/linux/linux_proto.h>
 
+#define AS(name) (sizeof(struct name) / sizeof(register_t))
+
 /* The casts are bogus but will do for now. */
 struct sysent linux_sysent[] = {
 	{ 0, (sy_call_t *)linux_setup },		/* 0 = linux_setup */
-	{ 1, (sy_call_t *)exit },			/* 1 = exit */
+	{ AS(rexit_args), (sy_call_t *)exit },		/* 1 = exit */
 	{ 0, (sy_call_t *)linux_fork },			/* 2 = linux_fork */
-	{ 3, (sy_call_t *)read },			/* 3 = read */
-	{ 3, (sy_call_t *)write },			/* 4 = write */
-	{ 3, (sy_call_t *)linux_open },			/* 5 = linux_open */
-	{ 1, (sy_call_t *)close },			/* 6 = close */
-	{ 3, (sy_call_t *)linux_waitpid },		/* 7 = linux_waitpid */
-	{ 2, (sy_call_t *)linux_creat },		/* 8 = linux_creat */
-	{ 2, (sy_call_t *)linux_link },			/* 9 = linux_link */
-	{ 1, (sy_call_t *)linux_unlink },		/* 10 = linux_unlink */
-	{ 3, (sy_call_t *)linux_execve },		/* 11 = linux_execve */
-	{ 1, (sy_call_t *)linux_chdir },		/* 12 = linux_chdir */
-	{ 1, (sy_call_t *)linux_time },			/* 13 = linux_time */
-	{ 3, (sy_call_t *)linux_mknod },		/* 14 = linux_mknod */
-	{ 2, (sy_call_t *)linux_chmod },		/* 15 = linux_chmod */
-	{ 3, (sy_call_t *)linux_lchown },		/* 16 = linux_lchown */
-	{ 1, (sy_call_t *)linux_break },		/* 17 = linux_break */
-	{ 2, (sy_call_t *)linux_stat },			/* 18 = linux_stat */
-	{ 3, (sy_call_t *)linux_lseek },		/* 19 = linux_lseek */
+	{ AS(read_args), (sy_call_t *)read },		/* 3 = read */
+	{ AS(write_args), (sy_call_t *)write },		/* 4 = write */
+	{ AS(linux_open_args), (sy_call_t *)linux_open },	/* 5 = linux_open */
+	{ AS(close_args), (sy_call_t *)close },		/* 6 = close */
+	{ AS(linux_waitpid_args), (sy_call_t *)linux_waitpid },	/* 7 = linux_waitpid */
+	{ AS(linux_creat_args), (sy_call_t *)linux_creat },	/* 8 = linux_creat */
+	{ AS(linux_link_args), (sy_call_t *)linux_link },	/* 9 = linux_link */
+	{ AS(linux_unlink_args), (sy_call_t *)linux_unlink },	/* 10 = linux_unlink */
+	{ AS(linux_execve_args), (sy_call_t *)linux_execve },	/* 11 = linux_execve */
+	{ AS(linux_chdir_args), (sy_call_t *)linux_chdir },	/* 12 = linux_chdir */
+	{ AS(linux_time_args), (sy_call_t *)linux_time },	/* 13 = linux_time */
+	{ AS(linux_mknod_args), (sy_call_t *)linux_mknod },	/* 14 = linux_mknod */
+	{ AS(linux_chmod_args), (sy_call_t *)linux_chmod },	/* 15 = linux_chmod */
+	{ AS(linux_lchown_args), (sy_call_t *)linux_lchown },	/* 16 = linux_lchown */
+	{ AS(linux_break_args), (sy_call_t *)linux_break },	/* 17 = linux_break */
+	{ AS(linux_stat_args), (sy_call_t *)linux_stat },	/* 18 = linux_stat */
+	{ AS(linux_lseek_args), (sy_call_t *)linux_lseek },	/* 19 = linux_lseek */
 	{ 0, (sy_call_t *)getpid },			/* 20 = getpid */
 	{ 0, (sy_call_t *)linux_mount },		/* 21 = linux_mount */
 	{ 0, (sy_call_t *)linux_umount },		/* 22 = linux_umount */
-	{ 1, (sy_call_t *)setuid },			/* 23 = setuid */
+	{ AS(setuid_args), (sy_call_t *)setuid },	/* 23 = setuid */
 	{ 0, (sy_call_t *)getuid },			/* 24 = getuid */
 	{ 0, (sy_call_t *)linux_stime },		/* 25 = linux_stime */
 	{ 0, (sy_call_t *)linux_ptrace },		/* 26 = linux_ptrace */
-	{ 1, (sy_call_t *)linux_alarm },		/* 27 = linux_alarm */
-	{ 2, (sy_call_t *)linux_fstat },		/* 28 = linux_fstat */
+	{ AS(linux_alarm_args), (sy_call_t *)linux_alarm },	/* 27 = linux_alarm */
+	{ AS(linux_fstat_args), (sy_call_t *)linux_fstat },	/* 28 = linux_fstat */
 	{ 0, (sy_call_t *)linux_pause },		/* 29 = linux_pause */
-	{ 2, (sy_call_t *)linux_utime },		/* 30 = linux_utime */
+	{ AS(linux_utime_args), (sy_call_t *)linux_utime },	/* 30 = linux_utime */
 	{ 0, (sy_call_t *)linux_stty },			/* 31 = linux_stty */
 	{ 0, (sy_call_t *)linux_gtty },			/* 32 = linux_gtty */
-	{ 2, (sy_call_t *)linux_access },		/* 33 = linux_access */
-	{ 1, (sy_call_t *)linux_nice },			/* 34 = linux_nice */
+	{ AS(linux_access_args), (sy_call_t *)linux_access },	/* 33 = linux_access */
+	{ AS(linux_nice_args), (sy_call_t *)linux_nice },	/* 34 = linux_nice */
 	{ 0, (sy_call_t *)linux_ftime },		/* 35 = linux_ftime */
 	{ 0, (sy_call_t *)sync },			/* 36 = sync */
-	{ 2, (sy_call_t *)linux_kill },			/* 37 = linux_kill */
-	{ 2, (sy_call_t *)linux_rename },		/* 38 = linux_rename */
-	{ 2, (sy_call_t *)linux_mkdir },		/* 39 = linux_mkdir */
-	{ 1, (sy_call_t *)linux_rmdir },		/* 40 = linux_rmdir */
-	{ 1, (sy_call_t *)dup },			/* 41 = dup */
-	{ 1, (sy_call_t *)linux_pipe },			/* 42 = linux_pipe */
-	{ 1, (sy_call_t *)linux_times },		/* 43 = linux_times */
+	{ AS(linux_kill_args), (sy_call_t *)linux_kill },	/* 37 = linux_kill */
+	{ AS(linux_rename_args), (sy_call_t *)linux_rename },	/* 38 = linux_rename */
+	{ AS(linux_mkdir_args), (sy_call_t *)linux_mkdir },	/* 39 = linux_mkdir */
+	{ AS(linux_rmdir_args), (sy_call_t *)linux_rmdir },	/* 40 = linux_rmdir */
+	{ AS(dup_args), (sy_call_t *)dup },		/* 41 = dup */
+	{ AS(linux_pipe_args), (sy_call_t *)linux_pipe },	/* 42 = linux_pipe */
+	{ AS(linux_times_args), (sy_call_t *)linux_times },	/* 43 = linux_times */
 	{ 0, (sy_call_t *)linux_prof },			/* 44 = linux_prof */
-	{ 1, (sy_call_t *)linux_brk },			/* 45 = linux_brk */
-	{ 1, (sy_call_t *)setgid },			/* 46 = setgid */
+	{ AS(linux_brk_args), (sy_call_t *)linux_brk },	/* 45 = linux_brk */
+	{ AS(setgid_args), (sy_call_t *)setgid },	/* 46 = setgid */
 	{ 0, (sy_call_t *)getgid },			/* 47 = getgid */
-	{ 2, (sy_call_t *)linux_signal },		/* 48 = linux_signal */
+	{ AS(linux_signal_args), (sy_call_t *)linux_signal },	/* 48 = linux_signal */
 	{ 0, (sy_call_t *)geteuid },			/* 49 = geteuid */
 	{ 0, (sy_call_t *)getegid },			/* 50 = getegid */
-	{ 1, (sy_call_t *)acct },			/* 51 = acct */
+	{ AS(acct_args), (sy_call_t *)acct },		/* 51 = acct */
 	{ 0, (sy_call_t *)linux_umount2 },		/* 52 = linux_umount2 */
 	{ 0, (sy_call_t *)linux_lock },			/* 53 = linux_lock */
-	{ 3, (sy_call_t *)linux_ioctl },		/* 54 = linux_ioctl */
-	{ 3, (sy_call_t *)linux_fcntl },		/* 55 = linux_fcntl */
+	{ AS(linux_ioctl_args), (sy_call_t *)linux_ioctl },	/* 54 = linux_ioctl */
+	{ AS(linux_fcntl_args), (sy_call_t *)linux_fcntl },	/* 55 = linux_fcntl */
 	{ 0, (sy_call_t *)linux_mpx },			/* 56 = linux_mpx */
-	{ 2, (sy_call_t *)setpgid },			/* 57 = setpgid */
+	{ AS(setpgid_args), (sy_call_t *)setpgid },	/* 57 = setpgid */
 	{ 0, (sy_call_t *)linux_ulimit },		/* 58 = linux_ulimit */
 	{ 0, (sy_call_t *)linux_olduname },		/* 59 = linux_olduname */
-	{ 1, (sy_call_t *)umask },			/* 60 = umask */
-	{ 1, (sy_call_t *)chroot },			/* 61 = chroot */
-	{ 2, (sy_call_t *)linux_ustat },		/* 62 = linux_ustat */
-	{ 2, (sy_call_t *)dup2 },			/* 63 = dup2 */
+	{ AS(umask_args), (sy_call_t *)umask },		/* 60 = umask */
+	{ AS(chroot_args), (sy_call_t *)chroot },	/* 61 = chroot */
+	{ AS(linux_ustat_args), (sy_call_t *)linux_ustat },	/* 62 = linux_ustat */
+	{ AS(dup2_args), (sy_call_t *)dup2 },		/* 63 = dup2 */
 	{ 0, (sy_call_t *)getppid },			/* 64 = getppid */
 	{ 0, (sy_call_t *)getpgrp },			/* 65 = getpgrp */
 	{ 0, (sy_call_t *)setsid },			/* 66 = setsid */
-	{ 3, (sy_call_t *)linux_sigaction },		/* 67 = linux_sigaction */
+	{ AS(linux_sigaction_args), (sy_call_t *)linux_sigaction },	/* 67 = linux_sigaction */
 	{ 0, (sy_call_t *)linux_siggetmask },		/* 68 = linux_siggetmask */
-	{ 1, (sy_call_t *)linux_sigsetmask },		/* 69 = linux_sigsetmask */
-	{ 2, (sy_call_t *)setreuid },			/* 70 = setreuid */
-	{ 2, (sy_call_t *)setregid },			/* 71 = setregid */
-	{ 3, (sy_call_t *)linux_sigsuspend },		/* 72 = linux_sigsuspend */
-	{ 1, (sy_call_t *)linux_sigpending },		/* 73 = linux_sigpending */
-	{ 2, (sy_call_t *)osethostname },		/* 74 = osethostname */
-	{ 2, (sy_call_t *)linux_setrlimit },		/* 75 = linux_setrlimit */
-	{ 2, (sy_call_t *)linux_getrlimit },		/* 76 = linux_getrlimit */
-	{ 2, (sy_call_t *)getrusage },			/* 77 = getrusage */
-	{ 2, (sy_call_t *)gettimeofday },		/* 78 = gettimeofday */
-	{ 2, (sy_call_t *)settimeofday },		/* 79 = settimeofday */
-	{ 2, (sy_call_t *)linux_getgroups },		/* 80 = linux_getgroups */
-	{ 2, (sy_call_t *)linux_setgroups },		/* 81 = linux_setgroups */
-	{ 1, (sy_call_t *)linux_select },		/* 82 = linux_select */
-	{ 2, (sy_call_t *)linux_symlink },		/* 83 = linux_symlink */
-	{ 2, (sy_call_t *)ostat },			/* 84 = ostat */
-	{ 3, (sy_call_t *)linux_readlink },		/* 85 = linux_readlink */
-	{ 1, (sy_call_t *)linux_uselib },		/* 86 = linux_uselib */
-	{ 1, (sy_call_t *)swapon },			/* 87 = swapon */
-	{ 1, (sy_call_t *)reboot },			/* 88 = reboot */
-	{ 3, (sy_call_t *)linux_readdir },		/* 89 = linux_readdir */
-	{ 1, (sy_call_t *)linux_mmap },			/* 90 = linux_mmap */
-	{ 2, (sy_call_t *)munmap },			/* 91 = munmap */
-	{ 2, (sy_call_t *)linux_truncate },		/* 92 = linux_truncate */
-	{ 2, (sy_call_t *)oftruncate },			/* 93 = oftruncate */
-	{ 2, (sy_call_t *)fchmod },			/* 94 = fchmod */
-	{ 3, (sy_call_t *)fchown },			/* 95 = fchown */
-	{ 2, (sy_call_t *)getpriority },		/* 96 = getpriority */
-	{ 3, (sy_call_t *)setpriority },		/* 97 = setpriority */
-	{ 4, (sy_call_t *)profil },			/* 98 = profil */
-	{ 2, (sy_call_t *)linux_statfs },		/* 99 = linux_statfs */
-	{ 2, (sy_call_t *)linux_fstatfs },		/* 100 = linux_fstatfs */
-	{ 3, (sy_call_t *)linux_ioperm },		/* 101 = linux_ioperm */
-	{ 2, (sy_call_t *)linux_socketcall },		/* 102 = linux_socketcall */
-	{ 1, (sy_call_t *)linux_ksyslog },		/* 103 = linux_ksyslog */
-	{ 3, (sy_call_t *)linux_setitimer },		/* 104 = linux_setitimer */
-	{ 2, (sy_call_t *)linux_getitimer },		/* 105 = linux_getitimer */
-	{ 2, (sy_call_t *)linux_newstat },		/* 106 = linux_newstat */
-	{ 2, (sy_call_t *)linux_newlstat },		/* 107 = linux_newlstat */
-	{ 2, (sy_call_t *)linux_newfstat },		/* 108 = linux_newfstat */
+	{ AS(linux_sigsetmask_args), (sy_call_t *)linux_sigsetmask },	/* 69 = linux_sigsetmask */
+	{ AS(setreuid_args), (sy_call_t *)setreuid },	/* 70 = setreuid */
+	{ AS(setregid_args), (sy_call_t *)setregid },	/* 71 = setregid */
+	{ AS(linux_sigsuspend_args), (sy_call_t *)linux_sigsuspend },	/* 72 = linux_sigsuspend */
+	{ AS(linux_sigpending_args), (sy_call_t *)linux_sigpending },	/* 73 = linux_sigpending */
+	{ AS(sethostname_args), (sy_call_t *)osethostname },	/* 74 = osethostname */
+	{ AS(linux_setrlimit_args), (sy_call_t *)linux_setrlimit },	/* 75 = linux_setrlimit */
+	{ AS(linux_getrlimit_args), (sy_call_t *)linux_getrlimit },	/* 76 = linux_getrlimit */
+	{ AS(getrusage_args), (sy_call_t *)getrusage },	/* 77 = getrusage */
+	{ AS(gettimeofday_args), (sy_call_t *)gettimeofday },	/* 78 = gettimeofday */
+	{ AS(settimeofday_args), (sy_call_t *)settimeofday },	/* 79 = settimeofday */
+	{ AS(linux_getgroups_args), (sy_call_t *)linux_getgroups },	/* 80 = linux_getgroups */
+	{ AS(linux_setgroups_args), (sy_call_t *)linux_setgroups },	/* 81 = linux_setgroups */
+	{ AS(linux_select_args), (sy_call_t *)linux_select },	/* 82 = linux_select */
+	{ AS(linux_symlink_args), (sy_call_t *)linux_symlink },	/* 83 = linux_symlink */
+	{ AS(ostat_args), (sy_call_t *)ostat },		/* 84 = ostat */
+	{ AS(linux_readlink_args), (sy_call_t *)linux_readlink },	/* 85 = linux_readlink */
+	{ AS(linux_uselib_args), (sy_call_t *)linux_uselib },	/* 86 = linux_uselib */
+	{ AS(swapon_args), (sy_call_t *)swapon },	/* 87 = swapon */
+	{ AS(reboot_args), (sy_call_t *)reboot },	/* 88 = reboot */
+	{ AS(linux_readdir_args), (sy_call_t *)linux_readdir },	/* 89 = linux_readdir */
+	{ AS(linux_mmap_args), (sy_call_t *)linux_mmap },	/* 90 = linux_mmap */
+	{ AS(munmap_args), (sy_call_t *)munmap },	/* 91 = munmap */
+	{ AS(linux_truncate_args), (sy_call_t *)linux_truncate },	/* 92 = linux_truncate */
+	{ AS(oftruncate_args), (sy_call_t *)oftruncate },	/* 93 = oftruncate */
+	{ AS(fchmod_args), (sy_call_t *)fchmod },	/* 94 = fchmod */
+	{ AS(fchown_args), (sy_call_t *)fchown },	/* 95 = fchown */
+	{ AS(getpriority_args), (sy_call_t *)getpriority },	/* 96 = getpriority */
+	{ AS(setpriority_args), (sy_call_t *)setpriority },	/* 97 = setpriority */
+	{ AS(profil_args), (sy_call_t *)profil },	/* 98 = profil */
+	{ AS(linux_statfs_args), (sy_call_t *)linux_statfs },	/* 99 = linux_statfs */
+	{ AS(linux_fstatfs_args), (sy_call_t *)linux_fstatfs },	/* 100 = linux_fstatfs */
+	{ AS(linux_ioperm_args), (sy_call_t *)linux_ioperm },	/* 101 = linux_ioperm */
+	{ AS(linux_socketcall_args), (sy_call_t *)linux_socketcall },	/* 102 = linux_socketcall */
+	{ AS(linux_ksyslog_args), (sy_call_t *)linux_ksyslog },	/* 103 = linux_ksyslog */
+	{ AS(linux_setitimer_args), (sy_call_t *)linux_setitimer },	/* 104 = linux_setitimer */
+	{ AS(linux_getitimer_args), (sy_call_t *)linux_getitimer },	/* 105 = linux_getitimer */
+	{ AS(linux_newstat_args), (sy_call_t *)linux_newstat },	/* 106 = linux_newstat */
+	{ AS(linux_newlstat_args), (sy_call_t *)linux_newlstat },	/* 107 = linux_newlstat */
+	{ AS(linux_newfstat_args), (sy_call_t *)linux_newfstat },	/* 108 = linux_newfstat */
 	{ 0, (sy_call_t *)linux_uname },		/* 109 = linux_uname */
-	{ 1, (sy_call_t *)linux_iopl },			/* 110 = linux_iopl */
+	{ AS(linux_iopl_args), (sy_call_t *)linux_iopl },	/* 110 = linux_iopl */
 	{ 0, (sy_call_t *)linux_vhangup },		/* 111 = linux_vhangup */
 	{ 0, (sy_call_t *)linux_idle },			/* 112 = linux_idle */
 	{ 0, (sy_call_t *)linux_vm86old },		/* 113 = linux_vm86old */
-	{ 4, (sy_call_t *)linux_wait4 },		/* 114 = linux_wait4 */
+	{ AS(linux_wait4_args), (sy_call_t *)linux_wait4 },	/* 114 = linux_wait4 */
 	{ 0, (sy_call_t *)linux_swapoff },		/* 115 = linux_swapoff */
 	{ 0, (sy_call_t *)linux_sysinfo },		/* 116 = linux_sysinfo */
-	{ 5, (sy_call_t *)linux_ipc },			/* 117 = linux_ipc */
-	{ 1, (sy_call_t *)fsync },			/* 118 = fsync */
-	{ 1, (sy_call_t *)linux_sigreturn },		/* 119 = linux_sigreturn */
-	{ 2, (sy_call_t *)linux_clone },		/* 120 = linux_clone */
-	{ 2, (sy_call_t *)setdomainname },		/* 121 = setdomainname */
-	{ 1, (sy_call_t *)linux_newuname },		/* 122 = linux_newuname */
-	{ 3, (sy_call_t *)linux_modify_ldt },		/* 123 = linux_modify_ldt */
+	{ AS(linux_ipc_args), (sy_call_t *)linux_ipc },	/* 117 = linux_ipc */
+	{ AS(fsync_args), (sy_call_t *)fsync },		/* 118 = fsync */
+	{ AS(linux_sigreturn_args), (sy_call_t *)linux_sigreturn },	/* 119 = linux_sigreturn */
+	{ AS(linux_clone_args), (sy_call_t *)linux_clone },	/* 120 = linux_clone */
+	{ AS(setdomainname_args), (sy_call_t *)setdomainname },	/* 121 = setdomainname */
+	{ AS(linux_newuname_args), (sy_call_t *)linux_newuname },	/* 122 = linux_newuname */
+	{ AS(linux_modify_ldt_args), (sy_call_t *)linux_modify_ldt },	/* 123 = linux_modify_ldt */
 	{ 0, (sy_call_t *)linux_adjtimex },		/* 124 = linux_adjtimex */
-	{ 3, (sy_call_t *)mprotect },			/* 125 = mprotect */
-	{ 3, (sy_call_t *)linux_sigprocmask },		/* 126 = linux_sigprocmask */
-	{ 0, (sy_call_t *)linux_create_module },		/* 127 = linux_create_module */
+	{ AS(mprotect_args), (sy_call_t *)mprotect },	/* 125 = mprotect */
+	{ AS(linux_sigprocmask_args), (sy_call_t *)linux_sigprocmask },	/* 126 = linux_sigprocmask */
+	{ 0, (sy_call_t *)linux_create_module },	/* 127 = linux_create_module */
 	{ 0, (sy_call_t *)linux_init_module },		/* 128 = linux_init_module */
-	{ 0, (sy_call_t *)linux_delete_module },		/* 129 = linux_delete_module */
-	{ 0, (sy_call_t *)linux_get_kernel_syms },		/* 130 = linux_get_kernel_syms */
+	{ 0, (sy_call_t *)linux_delete_module },	/* 129 = linux_delete_module */
+	{ 0, (sy_call_t *)linux_get_kernel_syms },	/* 130 = linux_get_kernel_syms */
 	{ 0, (sy_call_t *)linux_quotactl },		/* 131 = linux_quotactl */
-	{ 1, (sy_call_t *)linux_getpgid },		/* 132 = linux_getpgid */
-	{ 1, (sy_call_t *)fchdir },			/* 133 = fchdir */
+	{ AS(linux_getpgid_args), (sy_call_t *)linux_getpgid },	/* 132 = linux_getpgid */
+	{ AS(fchdir_args), (sy_call_t *)fchdir },	/* 133 = fchdir */
 	{ 0, (sy_call_t *)linux_bdflush },		/* 134 = linux_bdflush */
-	{ 3, (sy_call_t *)linux_sysfs },		/* 135 = linux_sysfs */
-	{ 1, (sy_call_t *)linux_personality },		/* 136 = linux_personality */
+	{ AS(linux_sysfs_args), (sy_call_t *)linux_sysfs },	/* 135 = linux_sysfs */
+	{ AS(linux_personality_args), (sy_call_t *)linux_personality },	/* 136 = linux_personality */
 	{ 0, (sy_call_t *)linux_afs_syscall },		/* 137 = linux_afs_syscall */
-	{ 1, (sy_call_t *)linux_setfsuid },		/* 138 = linux_setfsuid */
-	{ 1, (sy_call_t *)linux_setfsgid },		/* 139 = linux_setfsgid */
-	{ 5, (sy_call_t *)linux_llseek },		/* 140 = linux_llseek */
-	{ 3, (sy_call_t *)linux_getdents },		/* 141 = linux_getdents */
-	{ 5, (sy_call_t *)linux_newselect },		/* 142 = linux_newselect */
-	{ 2, (sy_call_t *)flock },			/* 143 = flock */
-	{ 3, (sy_call_t *)linux_msync },		/* 144 = linux_msync */
-	{ 3, (sy_call_t *)readv },			/* 145 = readv */
-	{ 3, (sy_call_t *)writev },			/* 146 = writev */
-	{ 1, (sy_call_t *)linux_getsid },		/* 147 = linux_getsid */
-	{ 1, (sy_call_t *)linux_fdatasync },		/* 148 = linux_fdatasync */
+	{ AS(linux_setfsuid_args), (sy_call_t *)linux_setfsuid },	/* 138 = linux_setfsuid */
+	{ AS(linux_setfsgid_args), (sy_call_t *)linux_setfsgid },	/* 139 = linux_setfsgid */
+	{ AS(linux_llseek_args), (sy_call_t *)linux_llseek },	/* 140 = linux_llseek */
+	{ AS(linux_getdents_args), (sy_call_t *)linux_getdents },	/* 141 = linux_getdents */
+	{ AS(linux_newselect_args), (sy_call_t *)linux_newselect },	/* 142 = linux_newselect */
+	{ AS(flock_args), (sy_call_t *)flock },		/* 143 = flock */
+	{ AS(linux_msync_args), (sy_call_t *)linux_msync },	/* 144 = linux_msync */
+	{ AS(readv_args), (sy_call_t *)readv },		/* 145 = readv */
+	{ AS(writev_args), (sy_call_t *)writev },	/* 146 = writev */
+	{ AS(linux_getsid_args), (sy_call_t *)linux_getsid },	/* 147 = linux_getsid */
+	{ AS(linux_fdatasync_args), (sy_call_t *)linux_fdatasync },	/* 148 = linux_fdatasync */
 	{ 0, (sy_call_t *)linux_sysctl },		/* 149 = linux_sysctl */
-	{ 2, (sy_call_t *)mlock },			/* 150 = mlock */
-	{ 2, (sy_call_t *)munlock },			/* 151 = munlock */
-	{ 1, (sy_call_t *)mlockall },			/* 152 = mlockall */
+	{ AS(mlock_args), (sy_call_t *)mlock },		/* 150 = mlock */
+	{ AS(munlock_args), (sy_call_t *)munlock },	/* 151 = munlock */
+	{ AS(mlockall_args), (sy_call_t *)mlockall },	/* 152 = mlockall */
 	{ 0, (sy_call_t *)munlockall },			/* 153 = munlockall */
-	{ 2, (sy_call_t *)sched_setparam },		/* 154 = sched_setparam */
-	{ 2, (sy_call_t *)sched_getparam },		/* 155 = sched_getparam */
-	{ 3, (sy_call_t *)linux_sched_setscheduler },		/* 156 = linux_sched_setscheduler */
-	{ 1, (sy_call_t *)linux_sched_getscheduler },		/* 157 = linux_sched_getscheduler */
+	{ AS(sched_setparam_args), (sy_call_t *)sched_setparam },	/* 154 = sched_setparam */
+	{ AS(sched_getparam_args), (sy_call_t *)sched_getparam },	/* 155 = sched_getparam */
+	{ AS(linux_sched_setscheduler_args), (sy_call_t *)linux_sched_setscheduler },	/* 156 = linux_sched_setscheduler */
+	{ AS(linux_sched_getscheduler_args), (sy_call_t *)linux_sched_getscheduler },	/* 157 = linux_sched_getscheduler */
 	{ 0, (sy_call_t *)sched_yield },		/* 158 = sched_yield */
-	{ 1, (sy_call_t *)sched_get_priority_max },		/* 159 = sched_get_priority_max */
-	{ 1, (sy_call_t *)sched_get_priority_min },		/* 160 = sched_get_priority_min */
-	{ 2, (sy_call_t *)sched_rr_get_interval },		/* 161 = sched_rr_get_interval */
-	{ 2, (sy_call_t *)nanosleep },			/* 162 = nanosleep */
-	{ 4, (sy_call_t *)linux_mremap },		/* 163 = linux_mremap */
-	{ 3, (sy_call_t *)setresuid },			/* 164 = setresuid */
-	{ 3, (sy_call_t *)linux_getresuid },		/* 165 = linux_getresuid */
+	{ AS(sched_get_priority_max_args), (sy_call_t *)sched_get_priority_max },	/* 159 = sched_get_priority_max */
+	{ AS(sched_get_priority_min_args), (sy_call_t *)sched_get_priority_min },	/* 160 = sched_get_priority_min */
+	{ AS(sched_rr_get_interval_args), (sy_call_t *)sched_rr_get_interval },	/* 161 = sched_rr_get_interval */
+	{ AS(nanosleep_args), (sy_call_t *)nanosleep },	/* 162 = nanosleep */
+	{ AS(linux_mremap_args), (sy_call_t *)linux_mremap },	/* 163 = linux_mremap */
+	{ AS(setresuid_args), (sy_call_t *)setresuid },	/* 164 = setresuid */
+	{ AS(linux_getresuid_args), (sy_call_t *)linux_getresuid },	/* 165 = linux_getresuid */
 	{ 0, (sy_call_t *)linux_vm86 },			/* 166 = linux_vm86 */
 	{ 0, (sy_call_t *)linux_query_module },		/* 167 = linux_query_module */
-	{ 3, (sy_call_t *)poll },			/* 168 = poll */
+	{ AS(poll_args), (sy_call_t *)poll },		/* 168 = poll */
 	{ 0, (sy_call_t *)linux_nfsservctl },		/* 169 = linux_nfsservctl */
-	{ 3, (sy_call_t *)setresgid },			/* 170 = setresgid */
-	{ 3, (sy_call_t *)linux_getresgid },		/* 171 = linux_getresgid */
+	{ AS(setresgid_args), (sy_call_t *)setresgid },	/* 170 = setresgid */
+	{ AS(linux_getresgid_args), (sy_call_t *)linux_getresgid },	/* 171 = linux_getresgid */
 	{ 0, (sy_call_t *)linux_prctl },		/* 172 = linux_prctl */
 	{ 0, (sy_call_t *)linux_rt_sigreturn },		/* 173 = linux_rt_sigreturn */
-	{ 4, (sy_call_t *)linux_rt_sigaction },		/* 174 = linux_rt_sigaction */
-	{ 4, (sy_call_t *)linux_rt_sigprocmask },		/* 175 = linux_rt_sigprocmask */
-	{ 0, (sy_call_t *)linux_rt_sigpending },		/* 176 = linux_rt_sigpending */
-	{ 0, (sy_call_t *)linux_rt_sigtimedwait },		/* 177 = linux_rt_sigtimedwait */
-	{ 0, (sy_call_t *)linux_rt_sigqueueinfo },		/* 178 = linux_rt_sigqueueinfo */
-	{ 2, (sy_call_t *)linux_rt_sigsuspend },		/* 179 = linux_rt_sigsuspend */
+	{ AS(linux_rt_sigaction_args), (sy_call_t *)linux_rt_sigaction },	/* 174 = linux_rt_sigaction */
+	{ AS(linux_rt_sigprocmask_args), (sy_call_t *)linux_rt_sigprocmask },	/* 175 = linux_rt_sigprocmask */
+	{ 0, (sy_call_t *)linux_rt_sigpending },	/* 176 = linux_rt_sigpending */
+	{ 0, (sy_call_t *)linux_rt_sigtimedwait },	/* 177 = linux_rt_sigtimedwait */
+	{ 0, (sy_call_t *)linux_rt_sigqueueinfo },	/* 178 = linux_rt_sigqueueinfo */
+	{ AS(linux_rt_sigsuspend_args), (sy_call_t *)linux_rt_sigsuspend },	/* 179 = linux_rt_sigsuspend */
 	{ 0, (sy_call_t *)linux_pread },		/* 180 = linux_pread */
 	{ 0, (sy_call_t *)linux_pwrite },		/* 181 = linux_pwrite */
-	{ 3, (sy_call_t *)linux_chown },		/* 182 = linux_chown */
-	{ 2, (sy_call_t *)linux_getcwd },		/* 183 = linux_getcwd */
+	{ AS(linux_chown_args), (sy_call_t *)linux_chown },	/* 182 = linux_chown */
+	{ AS(linux_getcwd_args), (sy_call_t *)linux_getcwd },	/* 183 = linux_getcwd */
 	{ 0, (sy_call_t *)linux_capget },		/* 184 = linux_capget */
 	{ 0, (sy_call_t *)linux_capset },		/* 185 = linux_capset */
-	{ 2, (sy_call_t *)linux_sigaltstack },		/* 186 = linux_sigaltstack */
+	{ AS(linux_sigaltstack_args), (sy_call_t *)linux_sigaltstack },	/* 186 = linux_sigaltstack */
 	{ 0, (sy_call_t *)linux_sendfile },		/* 187 = linux_sendfile */
 	{ 0, (sy_call_t *)linux_getpmsg },		/* 188 = linux_getpmsg */
 	{ 0, (sy_call_t *)linux_putpmsg },		/* 189 = linux_putpmsg */
diff --git a/sys/kern/init_sysent.c b/sys/kern/init_sysent.c
index ca78dab..2068250 100644
--- a/sys/kern/init_sysent.c
+++ b/sys/kern/init_sysent.c
@@ -12,6 +12,8 @@
 #include <sys/sysent.h>
 #include <sys/sysproto.h>
 
+#define AS(name) (sizeof(struct name) / sizeof(register_t))
+
 #ifdef COMPAT_43
 #define compat(n, name) n, (sy_call_t *)__CONCAT(o,name)
 #else
@@ -21,215 +23,215 @@
 /* The casts are bogus but will do for now. */
 struct sysent sysent[] = {
 	{ 0, (sy_call_t *)nosys },			/* 0 = syscall */
-	{ 1, (sy_call_t *)exit },			/* 1 = exit */
+	{ AS(rexit_args), (sy_call_t *)exit },		/* 1 = exit */
 	{ 0, (sy_call_t *)fork },			/* 2 = fork */
-	{ 3, (sy_call_t *)read },			/* 3 = read */
-	{ 3, (sy_call_t *)write },			/* 4 = write */
-	{ 3, (sy_call_t *)open },			/* 5 = open */
-	{ 1, (sy_call_t *)close },			/* 6 = close */
-	{ 4, (sy_call_t *)wait4 },			/* 7 = wait4 */
-	{ compat(2,creat) },		/* 8 = old creat */
-	{ 2, (sy_call_t *)link },			/* 9 = link */
-	{ 1, (sy_call_t *)unlink },			/* 10 = unlink */
+	{ AS(read_args), (sy_call_t *)read },		/* 3 = read */
+	{ AS(write_args), (sy_call_t *)write },		/* 4 = write */
+	{ AS(open_args), (sy_call_t *)open },		/* 5 = open */
+	{ AS(close_args), (sy_call_t *)close },		/* 6 = close */
+	{ AS(wait_args), (sy_call_t *)wait4 },		/* 7 = wait4 */
+	{ compat(AS(ocreat_args),creat) },		/* 8 = old creat */
+	{ AS(link_args), (sy_call_t *)link },		/* 9 = link */
+	{ AS(unlink_args), (sy_call_t *)unlink },	/* 10 = unlink */
 	{ 0, (sy_call_t *)nosys },			/* 11 = obsolete execv */
-	{ 1, (sy_call_t *)chdir },			/* 12 = chdir */
-	{ 1, (sy_call_t *)fchdir },			/* 13 = fchdir */
-	{ 3, (sy_call_t *)mknod },			/* 14 = mknod */
-	{ 2, (sy_call_t *)chmod },			/* 15 = chmod */
-	{ 3, (sy_call_t *)chown },			/* 16 = chown */
-	{ 1, (sy_call_t *)obreak },			/* 17 = break */
-	{ 3, (sy_call_t *)getfsstat },			/* 18 = getfsstat */
-	{ compat(3,lseek) },		/* 19 = old lseek */
+	{ AS(chdir_args), (sy_call_t *)chdir },		/* 12 = chdir */
+	{ AS(fchdir_args), (sy_call_t *)fchdir },	/* 13 = fchdir */
+	{ AS(mknod_args), (sy_call_t *)mknod },		/* 14 = mknod */
+	{ AS(chmod_args), (sy_call_t *)chmod },		/* 15 = chmod */
+	{ AS(chown_args), (sy_call_t *)chown },		/* 16 = chown */
+	{ AS(obreak_args), (sy_call_t *)obreak },	/* 17 = break */
+	{ AS(getfsstat_args), (sy_call_t *)getfsstat },	/* 18 = getfsstat */
+	{ compat(AS(olseek_args),lseek) },		/* 19 = old lseek */
 	{ 0, (sy_call_t *)getpid },			/* 20 = getpid */
-	{ 4, (sy_call_t *)mount },			/* 21 = mount */
-	{ 2, (sy_call_t *)unmount },			/* 22 = unmount */
-	{ 1, (sy_call_t *)setuid },			/* 23 = setuid */
-	{ SYF_MPSAFE | 0, (sy_call_t *)getuid },		/* 24 = getuid */
-	{ SYF_MPSAFE | 0, (sy_call_t *)geteuid },		/* 25 = geteuid */
-	{ 4, (sy_call_t *)ptrace },			/* 26 = ptrace */
-	{ 3, (sy_call_t *)recvmsg },			/* 27 = recvmsg */
-	{ 3, (sy_call_t *)sendmsg },			/* 28 = sendmsg */
-	{ 6, (sy_call_t *)recvfrom },			/* 29 = recvfrom */
-	{ 3, (sy_call_t *)accept },			/* 30 = accept */
-	{ 3, (sy_call_t *)getpeername },		/* 31 = getpeername */
-	{ 3, (sy_call_t *)getsockname },		/* 32 = getsockname */
-	{ 2, (sy_call_t *)access },			/* 33 = access */
-	{ 2, (sy_call_t *)chflags },			/* 34 = chflags */
-	{ 2, (sy_call_t *)fchflags },			/* 35 = fchflags */
+	{ AS(mount_args), (sy_call_t *)mount },		/* 21 = mount */
+	{ AS(unmount_args), (sy_call_t *)unmount },	/* 22 = unmount */
+	{ AS(setuid_args), (sy_call_t *)setuid },	/* 23 = setuid */
+	{ SYF_MPSAFE | 0, (sy_call_t *)getuid },	/* 24 = getuid */
+	{ SYF_MPSAFE | 0, (sy_call_t *)geteuid },	/* 25 = geteuid */
+	{ AS(ptrace_args), (sy_call_t *)ptrace },	/* 26 = ptrace */
+	{ AS(recvmsg_args), (sy_call_t *)recvmsg },	/* 27 = recvmsg */
+	{ AS(sendmsg_args), (sy_call_t *)sendmsg },	/* 28 = sendmsg */
+	{ AS(recvfrom_args), (sy_call_t *)recvfrom },	/* 29 = recvfrom */
+	{ AS(accept_args), (sy_call_t *)accept },	/* 30 = accept */
+	{ AS(getpeername_args), (sy_call_t *)getpeername },	/* 31 = getpeername */
+	{ AS(getsockname_args), (sy_call_t *)getsockname },	/* 32 = getsockname */
+	{ AS(access_args), (sy_call_t *)access },	/* 33 = access */
+	{ AS(chflags_args), (sy_call_t *)chflags },	/* 34 = chflags */
+	{ AS(fchflags_args), (sy_call_t *)fchflags },	/* 35 = fchflags */
 	{ 0, (sy_call_t *)sync },			/* 36 = sync */
-	{ 2, (sy_call_t *)kill },			/* 37 = kill */
-	{ compat(2,stat) },		/* 38 = old stat */
+	{ AS(kill_args), (sy_call_t *)kill },		/* 37 = kill */
+	{ compat(AS(ostat_args),stat) },		/* 38 = old stat */
 	{ 0, (sy_call_t *)getppid },			/* 39 = getppid */
-	{ compat(2,lstat) },		/* 40 = old lstat */
-	{ 1, (sy_call_t *)dup },			/* 41 = dup */
+	{ compat(AS(olstat_args),lstat) },		/* 40 = old lstat */
+	{ AS(dup_args), (sy_call_t *)dup },		/* 41 = dup */
 	{ 0, (sy_call_t *)pipe },			/* 42 = pipe */
 	{ 0, (sy_call_t *)getegid },			/* 43 = getegid */
-	{ 4, (sy_call_t *)profil },			/* 44 = profil */
-	{ 4, (sy_call_t *)ktrace },			/* 45 = ktrace */
-	{ compat(3,sigaction) },		/* 46 = old sigaction */
-	{ SYF_MPSAFE | 0, (sy_call_t *)getgid },		/* 47 = getgid */
-	{ compat(SYF_MPSAFE | 2,sigprocmask) },		/* 48 = old sigprocmask */
-	{ 2, (sy_call_t *)getlogin },			/* 49 = getlogin */
-	{ 1, (sy_call_t *)setlogin },			/* 50 = setlogin */
-	{ 1, (sy_call_t *)acct },			/* 51 = acct */
-	{ compat(0,sigpending) },		/* 52 = old sigpending */
-	{ 2, (sy_call_t *)sigaltstack },		/* 53 = sigaltstack */
-	{ 3, (sy_call_t *)ioctl },			/* 54 = ioctl */
-	{ 1, (sy_call_t *)reboot },			/* 55 = reboot */
-	{ 1, (sy_call_t *)revoke },			/* 56 = revoke */
-	{ 2, (sy_call_t *)symlink },			/* 57 = symlink */
-	{ 3, (sy_call_t *)readlink },			/* 58 = readlink */
-	{ 3, (sy_call_t *)execve },			/* 59 = execve */
-	{ SYF_MPSAFE | 1, (sy_call_t *)umask },		/* 60 = umask */
-	{ 1, (sy_call_t *)chroot },			/* 61 = chroot */
-	{ compat(2,fstat) },		/* 62 = old fstat */
-	{ compat(4,getkerninfo) },		/* 63 = old getkerninfo */
-	{ compat(0,getpagesize) },		/* 64 = old getpagesize */
-	{ 3, (sy_call_t *)msync },			/* 65 = msync */
+	{ AS(profil_args), (sy_call_t *)profil },	/* 44 = profil */
+	{ AS(ktrace_args), (sy_call_t *)ktrace },	/* 45 = ktrace */
+	{ compat(AS(osigaction_args),sigaction) },	/* 46 = old sigaction */
+	{ SYF_MPSAFE | 0, (sy_call_t *)getgid },	/* 47 = getgid */
+	{ compat(SYF_MPSAFE | AS(osigprocmask_args),sigprocmask) },	/* 48 = old sigprocmask */
+	{ AS(getlogin_args), (sy_call_t *)getlogin },	/* 49 = getlogin */
+	{ AS(setlogin_args), (sy_call_t *)setlogin },	/* 50 = setlogin */
+	{ AS(acct_args), (sy_call_t *)acct },		/* 51 = acct */
+	{ compat(0,sigpending) },			/* 52 = old sigpending */
+	{ AS(sigaltstack_args), (sy_call_t *)sigaltstack },	/* 53 = sigaltstack */
+	{ AS(ioctl_args), (sy_call_t *)ioctl },		/* 54 = ioctl */
+	{ AS(reboot_args), (sy_call_t *)reboot },	/* 55 = reboot */
+	{ AS(revoke_args), (sy_call_t *)revoke },	/* 56 = revoke */
+	{ AS(symlink_args), (sy_call_t *)symlink },	/* 57 = symlink */
+	{ AS(readlink_args), (sy_call_t *)readlink },	/* 58 = readlink */
+	{ AS(execve_args), (sy_call_t *)execve },	/* 59 = execve */
+	{ SYF_MPSAFE | AS(umask_args), (sy_call_t *)umask },	/* 60 = umask */
+	{ AS(chroot_args), (sy_call_t *)chroot },	/* 61 = chroot */
+	{ compat(AS(ofstat_args),fstat) },		/* 62 = old fstat */
+	{ compat(AS(getkerninfo_args),getkerninfo) },	/* 63 = old getkerninfo */
+	{ compat(0,getpagesize) },			/* 64 = old getpagesize */
+	{ AS(msync_args), (sy_call_t *)msync },		/* 65 = msync */
 	{ 0, (sy_call_t *)vfork },			/* 66 = vfork */
 	{ 0, (sy_call_t *)nosys },			/* 67 = obsolete vread */
 	{ 0, (sy_call_t *)nosys },			/* 68 = obsolete vwrite */
-	{ 1, (sy_call_t *)sbrk },			/* 69 = sbrk */
-	{ 1, (sy_call_t *)sstk },			/* 70 = sstk */
-	{ compat(6,mmap) },		/* 71 = old mmap */
-	{ 1, (sy_call_t *)ovadvise },			/* 72 = vadvise */
-	{ 2, (sy_call_t *)munmap },			/* 73 = munmap */
-	{ 3, (sy_call_t *)mprotect },			/* 74 = mprotect */
-	{ 3, (sy_call_t *)madvise },			/* 75 = madvise */
+	{ AS(sbrk_args), (sy_call_t *)sbrk },		/* 69 = sbrk */
+	{ AS(sstk_args), (sy_call_t *)sstk },		/* 70 = sstk */
+	{ compat(AS(ommap_args),mmap) },		/* 71 = old mmap */
+	{ AS(ovadvise_args), (sy_call_t *)ovadvise },	/* 72 = vadvise */
+	{ AS(munmap_args), (sy_call_t *)munmap },	/* 73 = munmap */
+	{ AS(mprotect_args), (sy_call_t *)mprotect },	/* 74 = mprotect */
+	{ AS(madvise_args), (sy_call_t *)madvise },	/* 75 = madvise */
 	{ 0, (sy_call_t *)nosys },			/* 76 = obsolete vhangup */
 	{ 0, (sy_call_t *)nosys },			/* 77 = obsolete vlimit */
-	{ 3, (sy_call_t *)mincore },			/* 78 = mincore */
-	{ 2, (sy_call_t *)getgroups },			/* 79 = getgroups */
-	{ 2, (sy_call_t *)setgroups },			/* 80 = setgroups */
-	{ SYF_MPSAFE | 0, (sy_call_t *)getpgrp },		/* 81 = getpgrp */
-	{ 2, (sy_call_t *)setpgid },			/* 82 = setpgid */
-	{ 3, (sy_call_t *)setitimer },			/* 83 = setitimer */
-	{ compat(0,wait) },		/* 84 = old wait */
-	{ 1, (sy_call_t *)swapon },			/* 85 = swapon */
-	{ 2, (sy_call_t *)getitimer },			/* 86 = getitimer */
-	{ compat(2,gethostname) },		/* 87 = old gethostname */
-	{ compat(2,sethostname) },		/* 88 = old sethostname */
+	{ AS(mincore_args), (sy_call_t *)mincore },	/* 78 = mincore */
+	{ AS(getgroups_args), (sy_call_t *)getgroups },	/* 79 = getgroups */
+	{ AS(setgroups_args), (sy_call_t *)setgroups },	/* 80 = setgroups */
+	{ SYF_MPSAFE | 0, (sy_call_t *)getpgrp },	/* 81 = getpgrp */
+	{ AS(setpgid_args), (sy_call_t *)setpgid },	/* 82 = setpgid */
+	{ AS(setitimer_args), (sy_call_t *)setitimer },	/* 83 = setitimer */
+	{ compat(0,wait) },				/* 84 = old wait */
+	{ AS(swapon_args), (sy_call_t *)swapon },	/* 85 = swapon */
+	{ AS(getitimer_args), (sy_call_t *)getitimer },	/* 86 = getitimer */
+	{ compat(AS(gethostname_args),gethostname) },	/* 87 = old gethostname */
+	{ compat(AS(sethostname_args),sethostname) },	/* 88 = old sethostname */
 	{ 0, (sy_call_t *)getdtablesize },		/* 89 = getdtablesize */
-	{ 2, (sy_call_t *)dup2 },			/* 90 = dup2 */
+	{ AS(dup2_args), (sy_call_t *)dup2 },		/* 90 = dup2 */
 	{ 0, (sy_call_t *)nosys },			/* 91 = getdopt */
-	{ 3, (sy_call_t *)fcntl },			/* 92 = fcntl */
-	{ 5, (sy_call_t *)select },			/* 93 = select */
+	{ AS(fcntl_args), (sy_call_t *)fcntl },		/* 92 = fcntl */
+	{ AS(select_args), (sy_call_t *)select },	/* 93 = select */
 	{ 0, (sy_call_t *)nosys },			/* 94 = setdopt */
-	{ 1, (sy_call_t *)fsync },			/* 95 = fsync */
-	{ 3, (sy_call_t *)setpriority },		/* 96 = setpriority */
-	{ 3, (sy_call_t *)socket },			/* 97 = socket */
-	{ 3, (sy_call_t *)connect },			/* 98 = connect */
-	{ compat(3,accept) },		/* 99 = old accept */
-	{ 2, (sy_call_t *)getpriority },		/* 100 = getpriority */
-	{ compat(4,send) },		/* 101 = old send */
-	{ compat(4,recv) },		/* 102 = old recv */
-	{ compat(1,sigreturn) },		/* 103 = old sigreturn */
-	{ 3, (sy_call_t *)bind },			/* 104 = bind */
-	{ 5, (sy_call_t *)setsockopt },			/* 105 = setsockopt */
-	{ 2, (sy_call_t *)listen },			/* 106 = listen */
+	{ AS(fsync_args), (sy_call_t *)fsync },		/* 95 = fsync */
+	{ AS(setpriority_args), (sy_call_t *)setpriority },	/* 96 = setpriority */
+	{ AS(socket_args), (sy_call_t *)socket },	/* 97 = socket */
+	{ AS(connect_args), (sy_call_t *)connect },	/* 98 = connect */
+	{ compat(AS(accept_args),accept) },		/* 99 = old accept */
+	{ AS(getpriority_args), (sy_call_t *)getpriority },	/* 100 = getpriority */
+	{ compat(AS(osend_args),send) },		/* 101 = old send */
+	{ compat(AS(orecv_args),recv) },		/* 102 = old recv */
+	{ compat(AS(osigreturn_args),sigreturn) },	/* 103 = old sigreturn */
+	{ AS(bind_args), (sy_call_t *)bind },		/* 104 = bind */
+	{ AS(setsockopt_args), (sy_call_t *)setsockopt },	/* 105 = setsockopt */
+	{ AS(listen_args), (sy_call_t *)listen },	/* 106 = listen */
 	{ 0, (sy_call_t *)nosys },			/* 107 = obsolete vtimes */
-	{ compat(3,sigvec) },		/* 108 = old sigvec */
-	{ compat(1,sigblock) },		/* 109 = old sigblock */
-	{ compat(1,sigsetmask) },		/* 110 = old sigsetmask */
-	{ compat(1,sigsuspend) },		/* 111 = old sigsuspend */
-	{ compat(2,sigstack) },		/* 112 = old sigstack */
-	{ compat(3,recvmsg) },		/* 113 = old recvmsg */
-	{ compat(3,sendmsg) },		/* 114 = old sendmsg */
+	{ compat(AS(osigvec_args),sigvec) },		/* 108 = old sigvec */
+	{ compat(AS(osigblock_args),sigblock) },	/* 109 = old sigblock */
+	{ compat(AS(osigsetmask_args),sigsetmask) },	/* 110 = old sigsetmask */
+	{ compat(AS(osigsuspend_args),sigsuspend) },	/* 111 = old sigsuspend */
+	{ compat(AS(osigstack_args),sigstack) },	/* 112 = old sigstack */
+	{ compat(AS(orecvmsg_args),recvmsg) },		/* 113 = old recvmsg */
+	{ compat(AS(osendmsg_args),sendmsg) },		/* 114 = old sendmsg */
 	{ 0, (sy_call_t *)nosys },			/* 115 = obsolete vtrace */
-	{ 2, (sy_call_t *)gettimeofday },		/* 116 = gettimeofday */
-	{ 2, (sy_call_t *)getrusage },			/* 117 = getrusage */
-	{ 5, (sy_call_t *)getsockopt },			/* 118 = getsockopt */
+	{ AS(gettimeofday_args), (sy_call_t *)gettimeofday },	/* 116 = gettimeofday */
+	{ AS(getrusage_args), (sy_call_t *)getrusage },	/* 117 = getrusage */
+	{ AS(getsockopt_args), (sy_call_t *)getsockopt },	/* 118 = getsockopt */
 	{ 0, (sy_call_t *)nosys },			/* 119 = resuba */
-	{ 3, (sy_call_t *)readv },			/* 120 = readv */
-	{ 3, (sy_call_t *)writev },			/* 121 = writev */
-	{ 2, (sy_call_t *)settimeofday },		/* 122 = settimeofday */
-	{ 3, (sy_call_t *)fchown },			/* 123 = fchown */
-	{ 2, (sy_call_t *)fchmod },			/* 124 = fchmod */
-	{ compat(6,recvfrom) },		/* 125 = old recvfrom */
-	{ 2, (sy_call_t *)setreuid },			/* 126 = setreuid */
-	{ 2, (sy_call_t *)setregid },			/* 127 = setregid */
-	{ 2, (sy_call_t *)rename },			/* 128 = rename */
-	{ compat(2,truncate) },		/* 129 = old truncate */
-	{ compat(2,ftruncate) },		/* 130 = old ftruncate */
-	{ 2, (sy_call_t *)flock },			/* 131 = flock */
-	{ 2, (sy_call_t *)mkfifo },			/* 132 = mkfifo */
-	{ 6, (sy_call_t *)sendto },			/* 133 = sendto */
-	{ 2, (sy_call_t *)shutdown },			/* 134 = shutdown */
-	{ 4, (sy_call_t *)socketpair },			/* 135 = socketpair */
-	{ 2, (sy_call_t *)mkdir },			/* 136 = mkdir */
-	{ 1, (sy_call_t *)rmdir },			/* 137 = rmdir */
-	{ 2, (sy_call_t *)utimes },			/* 138 = utimes */
+	{ AS(readv_args), (sy_call_t *)readv },		/* 120 = readv */
+	{ AS(writev_args), (sy_call_t *)writev },	/* 121 = writev */
+	{ AS(settimeofday_args), (sy_call_t *)settimeofday },	/* 122 = settimeofday */
+	{ AS(fchown_args), (sy_call_t *)fchown },	/* 123 = fchown */
+	{ AS(fchmod_args), (sy_call_t *)fchmod },	/* 124 = fchmod */
+	{ compat(AS(recvfrom_args),recvfrom) },		/* 125 = old recvfrom */
+	{ AS(setreuid_args), (sy_call_t *)setreuid },	/* 126 = setreuid */
+	{ AS(setregid_args), (sy_call_t *)setregid },	/* 127 = setregid */
+	{ AS(rename_args), (sy_call_t *)rename },	/* 128 = rename */
+	{ compat(AS(otruncate_args),truncate) },	/* 129 = old truncate */
+	{ compat(AS(oftruncate_args),ftruncate) },	/* 130 = old ftruncate */
+	{ AS(flock_args), (sy_call_t *)flock },		/* 131 = flock */
+	{ AS(mkfifo_args), (sy_call_t *)mkfifo },	/* 132 = mkfifo */
+	{ AS(sendto_args), (sy_call_t *)sendto },	/* 133 = sendto */
+	{ AS(shutdown_args), (sy_call_t *)shutdown },	/* 134 = shutdown */
+	{ AS(socketpair_args), (sy_call_t *)socketpair },	/* 135 = socketpair */
+	{ AS(mkdir_args), (sy_call_t *)mkdir },		/* 136 = mkdir */
+	{ AS(rmdir_args), (sy_call_t *)rmdir },		/* 137 = rmdir */
+	{ AS(utimes_args), (sy_call_t *)utimes },	/* 138 = utimes */
 	{ 0, (sy_call_t *)nosys },			/* 139 = obsolete 4.2 sigreturn */
-	{ 2, (sy_call_t *)adjtime },			/* 140 = adjtime */
-	{ compat(3,getpeername) },		/* 141 = old getpeername */
-	{ compat(0,gethostid) },		/* 142 = old gethostid */
-	{ compat(1,sethostid) },		/* 143 = old sethostid */
-	{ compat(2,getrlimit) },		/* 144 = old getrlimit */
-	{ compat(2,setrlimit) },		/* 145 = old setrlimit */
-	{ compat(2,killpg) },		/* 146 = old killpg */
+	{ AS(adjtime_args), (sy_call_t *)adjtime },	/* 140 = adjtime */
+	{ compat(AS(ogetpeername_args),getpeername) },	/* 141 = old getpeername */
+	{ compat(0,gethostid) },			/* 142 = old gethostid */
+	{ compat(AS(osethostid_args),sethostid) },	/* 143 = old sethostid */
+	{ compat(AS(ogetrlimit_args),getrlimit) },	/* 144 = old getrlimit */
+	{ compat(AS(osetrlimit_args),setrlimit) },	/* 145 = old setrlimit */
+	{ compat(AS(okillpg_args),killpg) },		/* 146 = old killpg */
 	{ 0, (sy_call_t *)setsid },			/* 147 = setsid */
-	{ 4, (sy_call_t *)quotactl },			/* 148 = quotactl */
-	{ compat(0,quota) },		/* 149 = old quota */
-	{ compat(3,getsockname) },		/* 150 = old getsockname */
+	{ AS(quotactl_args), (sy_call_t *)quotactl },	/* 148 = quotactl */
+	{ compat(0,quota) },				/* 149 = old quota */
+	{ compat(AS(getsockname_args),getsockname) },	/* 150 = old getsockname */
 	{ 0, (sy_call_t *)nosys },			/* 151 = sem_lock */
 	{ 0, (sy_call_t *)nosys },			/* 152 = sem_wakeup */
 	{ 0, (sy_call_t *)nosys },			/* 153 = asyncdaemon */
 	{ 0, (sy_call_t *)nosys },			/* 154 = nosys */
-	{ 2, (sy_call_t *)nosys },			/* 155 = nfssvc */
-	{ compat(4,getdirentries) },		/* 156 = old getdirentries */
-	{ 2, (sy_call_t *)statfs },			/* 157 = statfs */
-	{ 2, (sy_call_t *)fstatfs },			/* 158 = fstatfs */
+	{ AS(nfssvc_args), (sy_call_t *)nosys },	/* 155 = nfssvc */
+	{ compat(AS(ogetdirentries_args),getdirentries) },	/* 156 = old getdirentries */
+	{ AS(statfs_args), (sy_call_t *)statfs },	/* 157 = statfs */
+	{ AS(fstatfs_args), (sy_call_t *)fstatfs },	/* 158 = fstatfs */
 	{ 0, (sy_call_t *)nosys },			/* 159 = nosys */
 	{ 0, (sy_call_t *)nosys },			/* 160 = nosys */
-	{ 2, (sy_call_t *)getfh },			/* 161 = getfh */
-	{ 2, (sy_call_t *)getdomainname },		/* 162 = getdomainname */
-	{ 2, (sy_call_t *)setdomainname },		/* 163 = setdomainname */
-	{ 1, (sy_call_t *)uname },			/* 164 = uname */
-	{ 2, (sy_call_t *)sysarch },			/* 165 = sysarch */
-	{ 3, (sy_call_t *)rtprio },			/* 166 = rtprio */
+	{ AS(getfh_args), (sy_call_t *)getfh },		/* 161 = getfh */
+	{ AS(getdomainname_args), (sy_call_t *)getdomainname },	/* 162 = getdomainname */
+	{ AS(setdomainname_args), (sy_call_t *)setdomainname },	/* 163 = setdomainname */
+	{ AS(uname_args), (sy_call_t *)uname },		/* 164 = uname */
+	{ AS(sysarch_args), (sy_call_t *)sysarch },	/* 165 = sysarch */
+	{ AS(rtprio_args), (sy_call_t *)rtprio },	/* 166 = rtprio */
 	{ 0, (sy_call_t *)nosys },			/* 167 = nosys */
 	{ 0, (sy_call_t *)nosys },			/* 168 = nosys */
-	{ 5, (sy_call_t *)semsys },			/* 169 = semsys */
-	{ 6, (sy_call_t *)msgsys },			/* 170 = msgsys */
-	{ 4, (sy_call_t *)shmsys },			/* 171 = shmsys */
+	{ AS(semsys_args), (sy_call_t *)semsys },	/* 169 = semsys */
+	{ AS(msgsys_args), (sy_call_t *)msgsys },	/* 170 = msgsys */
+	{ AS(shmsys_args), (sy_call_t *)shmsys },	/* 171 = shmsys */
 	{ 0, (sy_call_t *)nosys },			/* 172 = nosys */
-	{ 6, (sy_call_t *)pread },			/* 173 = pread */
-	{ 6, (sy_call_t *)pwrite },			/* 174 = pwrite */
+	{ AS(pread_args), (sy_call_t *)pread },		/* 173 = pread */
+	{ AS(pwrite_args), (sy_call_t *)pwrite },	/* 174 = pwrite */
 	{ 0, (sy_call_t *)nosys },			/* 175 = nosys */
-	{ 1, (sy_call_t *)ntp_adjtime },		/* 176 = ntp_adjtime */
+	{ AS(ntp_adjtime_args), (sy_call_t *)ntp_adjtime },	/* 176 = ntp_adjtime */
 	{ 0, (sy_call_t *)nosys },			/* 177 = sfork */
 	{ 0, (sy_call_t *)nosys },			/* 178 = getdescriptor */
 	{ 0, (sy_call_t *)nosys },			/* 179 = setdescriptor */
 	{ 0, (sy_call_t *)nosys },			/* 180 = nosys */
-	{ 1, (sy_call_t *)setgid },			/* 181 = setgid */
-	{ 1, (sy_call_t *)setegid },			/* 182 = setegid */
-	{ 1, (sy_call_t *)seteuid },			/* 183 = seteuid */
+	{ AS(setgid_args), (sy_call_t *)setgid },	/* 181 = setgid */
+	{ AS(setegid_args), (sy_call_t *)setegid },	/* 182 = setegid */
+	{ AS(seteuid_args), (sy_call_t *)seteuid },	/* 183 = seteuid */
 	{ 0, (sy_call_t *)nosys },			/* 184 = lfs_bmapv */
 	{ 0, (sy_call_t *)nosys },			/* 185 = lfs_markv */
 	{ 0, (sy_call_t *)nosys },			/* 186 = lfs_segclean */
 	{ 0, (sy_call_t *)nosys },			/* 187 = lfs_segwait */
-	{ 2, (sy_call_t *)stat },			/* 188 = stat */
-	{ 2, (sy_call_t *)fstat },			/* 189 = fstat */
-	{ 2, (sy_call_t *)lstat },			/* 190 = lstat */
-	{ 2, (sy_call_t *)pathconf },			/* 191 = pathconf */
-	{ 2, (sy_call_t *)fpathconf },			/* 192 = fpathconf */
+	{ AS(stat_args), (sy_call_t *)stat },		/* 188 = stat */
+	{ AS(fstat_args), (sy_call_t *)fstat },		/* 189 = fstat */
+	{ AS(lstat_args), (sy_call_t *)lstat },		/* 190 = lstat */
+	{ AS(pathconf_args), (sy_call_t *)pathconf },	/* 191 = pathconf */
+	{ AS(fpathconf_args), (sy_call_t *)fpathconf },	/* 192 = fpathconf */
 	{ 0, (sy_call_t *)nosys },			/* 193 = nosys */
-	{ 2, (sy_call_t *)getrlimit },			/* 194 = getrlimit */
-	{ 2, (sy_call_t *)setrlimit },			/* 195 = setrlimit */
-	{ 4, (sy_call_t *)getdirentries },		/* 196 = getdirentries */
-	{ 8, (sy_call_t *)mmap },			/* 197 = mmap */
+	{ AS(__getrlimit_args), (sy_call_t *)getrlimit },	/* 194 = getrlimit */
+	{ AS(__setrlimit_args), (sy_call_t *)setrlimit },	/* 195 = setrlimit */
+	{ AS(getdirentries_args), (sy_call_t *)getdirentries },	/* 196 = getdirentries */
+	{ AS(mmap_args), (sy_call_t *)mmap },		/* 197 = mmap */
 	{ 0, (sy_call_t *)nosys },			/* 198 = __syscall */
-	{ 5, (sy_call_t *)lseek },			/* 199 = lseek */
-	{ 4, (sy_call_t *)truncate },			/* 200 = truncate */
-	{ 4, (sy_call_t *)ftruncate },			/* 201 = ftruncate */
-	{ 6, (sy_call_t *)__sysctl },			/* 202 = __sysctl */
-	{ 2, (sy_call_t *)mlock },			/* 203 = mlock */
-	{ 2, (sy_call_t *)munlock },			/* 204 = munlock */
-	{ 1, (sy_call_t *)undelete },			/* 205 = undelete */
-	{ 2, (sy_call_t *)futimes },			/* 206 = futimes */
-	{ 1, (sy_call_t *)getpgid },			/* 207 = getpgid */
+	{ AS(lseek_args), (sy_call_t *)lseek },		/* 199 = lseek */
+	{ AS(truncate_args), (sy_call_t *)truncate },	/* 200 = truncate */
+	{ AS(ftruncate_args), (sy_call_t *)ftruncate },	/* 201 = ftruncate */
+	{ AS(sysctl_args), (sy_call_t *)__sysctl },	/* 202 = __sysctl */
+	{ AS(mlock_args), (sy_call_t *)mlock },		/* 203 = mlock */
+	{ AS(munlock_args), (sy_call_t *)munlock },	/* 204 = munlock */
+	{ AS(undelete_args), (sy_call_t *)undelete },	/* 205 = undelete */
+	{ AS(futimes_args), (sy_call_t *)futimes },	/* 206 = futimes */
+	{ AS(getpgid_args), (sy_call_t *)getpgid },	/* 207 = getpgid */
 	{ 0, (sy_call_t *)nosys },			/* 208 = newreboot */
-	{ 3, (sy_call_t *)poll },			/* 209 = poll */
+	{ AS(poll_args), (sy_call_t *)poll },		/* 209 = poll */
 	{ 0, (sy_call_t *)lkmnosys },			/* 210 = lkmnosys */
 	{ 0, (sy_call_t *)lkmnosys },			/* 211 = lkmnosys */
 	{ 0, (sy_call_t *)lkmnosys },			/* 212 = lkmnosys */
@@ -240,27 +242,27 @@ struct sysent sysent[] = {
 	{ 0, (sy_call_t *)lkmnosys },			/* 217 = lkmnosys */
 	{ 0, (sy_call_t *)lkmnosys },			/* 218 = lkmnosys */
 	{ 0, (sy_call_t *)lkmnosys },			/* 219 = lkmnosys */
-	{ 4, (sy_call_t *)__semctl },			/* 220 = __semctl */
-	{ 3, (sy_call_t *)semget },			/* 221 = semget */
-	{ 3, (sy_call_t *)semop },			/* 222 = semop */
+	{ AS(__semctl_args), (sy_call_t *)__semctl },	/* 220 = __semctl */
+	{ AS(semget_args), (sy_call_t *)semget },	/* 221 = semget */
+	{ AS(semop_args), (sy_call_t *)semop },		/* 222 = semop */
 	{ 0, (sy_call_t *)nosys },			/* 223 = semconfig */
-	{ 3, (sy_call_t *)msgctl },			/* 224 = msgctl */
-	{ 2, (sy_call_t *)msgget },			/* 225 = msgget */
-	{ 4, (sy_call_t *)msgsnd },			/* 226 = msgsnd */
-	{ 5, (sy_call_t *)msgrcv },			/* 227 = msgrcv */
-	{ 3, (sy_call_t *)shmat },			/* 228 = shmat */
-	{ 3, (sy_call_t *)shmctl },			/* 229 = shmctl */
-	{ 1, (sy_call_t *)shmdt },			/* 230 = shmdt */
-	{ 3, (sy_call_t *)shmget },			/* 231 = shmget */
-	{ 2, (sy_call_t *)clock_gettime },		/* 232 = clock_gettime */
-	{ 2, (sy_call_t *)clock_settime },		/* 233 = clock_settime */
-	{ 2, (sy_call_t *)clock_getres },		/* 234 = clock_getres */
+	{ AS(msgctl_args), (sy_call_t *)msgctl },	/* 224 = msgctl */
+	{ AS(msgget_args), (sy_call_t *)msgget },	/* 225 = msgget */
+	{ AS(msgsnd_args), (sy_call_t *)msgsnd },	/* 226 = msgsnd */
+	{ AS(msgrcv_args), (sy_call_t *)msgrcv },	/* 227 = msgrcv */
+	{ AS(shmat_args), (sy_call_t *)shmat },		/* 228 = shmat */
+	{ AS(shmctl_args), (sy_call_t *)shmctl },	/* 229 = shmctl */
+	{ AS(shmdt_args), (sy_call_t *)shmdt },		/* 230 = shmdt */
+	{ AS(shmget_args), (sy_call_t *)shmget },	/* 231 = shmget */
+	{ AS(clock_gettime_args), (sy_call_t *)clock_gettime },	/* 232 = clock_gettime */
+	{ AS(clock_settime_args), (sy_call_t *)clock_settime },	/* 233 = clock_settime */
+	{ AS(clock_getres_args), (sy_call_t *)clock_getres },	/* 234 = clock_getres */
 	{ 0, (sy_call_t *)nosys },			/* 235 = timer_create */
 	{ 0, (sy_call_t *)nosys },			/* 236 = timer_delete */
 	{ 0, (sy_call_t *)nosys },			/* 237 = timer_settime */
 	{ 0, (sy_call_t *)nosys },			/* 238 = timer_gettime */
 	{ 0, (sy_call_t *)nosys },			/* 239 = timer_getoverrun */
-	{ 2, (sy_call_t *)nanosleep },			/* 240 = nanosleep */
+	{ AS(nanosleep_args), (sy_call_t *)nanosleep },	/* 240 = nanosleep */
 	{ 0, (sy_call_t *)nosys },			/* 241 = nosys */
 	{ 0, (sy_call_t *)nosys },			/* 242 = nosys */
 	{ 0, (sy_call_t *)nosys },			/* 243 = nosys */
@@ -270,11 +272,11 @@ struct sysent sysent[] = {
 	{ 0, (sy_call_t *)nosys },			/* 247 = nosys */
 	{ 0, (sy_call_t *)nosys },			/* 248 = nosys */
 	{ 0, (sy_call_t *)nosys },			/* 249 = nosys */
-	{ 3, (sy_call_t *)minherit },			/* 250 = minherit */
-	{ 1, (sy_call_t *)rfork },			/* 251 = rfork */
-	{ 3, (sy_call_t *)openbsd_poll },		/* 252 = openbsd_poll */
+	{ AS(minherit_args), (sy_call_t *)minherit },	/* 250 = minherit */
+	{ AS(rfork_args), (sy_call_t *)rfork },		/* 251 = rfork */
+	{ AS(openbsd_poll_args), (sy_call_t *)openbsd_poll },	/* 252 = openbsd_poll */
 	{ 0, (sy_call_t *)issetugid },			/* 253 = issetugid */
-	{ 3, (sy_call_t *)lchown },			/* 254 = lchown */
+	{ AS(lchown_args), (sy_call_t *)lchown },	/* 254 = lchown */
 	{ 0, (sy_call_t *)nosys },			/* 255 = nosys */
 	{ 0, (sy_call_t *)nosys },			/* 256 = nosys */
 	{ 0, (sy_call_t *)nosys },			/* 257 = nosys */
@@ -292,15 +294,15 @@ struct sysent sysent[] = {
 	{ 0, (sy_call_t *)nosys },			/* 269 = nosys */
 	{ 0, (sy_call_t *)nosys },			/* 270 = nosys */
 	{ 0, (sy_call_t *)nosys },			/* 271 = nosys */
-	{ 3, (sy_call_t *)getdents },			/* 272 = getdents */
+	{ AS(getdents_args), (sy_call_t *)getdents },	/* 272 = getdents */
 	{ 0, (sy_call_t *)nosys },			/* 273 = nosys */
-	{ 2, (sy_call_t *)lchmod },			/* 274 = lchmod */
-	{ 3, (sy_call_t *)lchown },			/* 275 = netbsd_lchown */
-	{ 2, (sy_call_t *)lutimes },			/* 276 = lutimes */
-	{ 3, (sy_call_t *)msync },			/* 277 = netbsd_msync */
-	{ 2, (sy_call_t *)nstat },			/* 278 = nstat */
-	{ 2, (sy_call_t *)nfstat },			/* 279 = nfstat */
-	{ 2, (sy_call_t *)nlstat },			/* 280 = nlstat */
+	{ AS(lchmod_args), (sy_call_t *)lchmod },	/* 274 = lchmod */
+	{ AS(lchown_args), (sy_call_t *)lchown },	/* 275 = netbsd_lchown */
+	{ AS(lutimes_args), (sy_call_t *)lutimes },	/* 276 = lutimes */
+	{ AS(msync_args), (sy_call_t *)msync },		/* 277 = netbsd_msync */
+	{ AS(nstat_args), (sy_call_t *)nstat },		/* 278 = nstat */
+	{ AS(nfstat_args), (sy_call_t *)nfstat },	/* 279 = nfstat */
+	{ AS(nlstat_args), (sy_call_t *)nlstat },	/* 280 = nlstat */
 	{ 0, (sy_call_t *)nosys },			/* 281 = nosys */
 	{ 0, (sy_call_t *)nosys },			/* 282 = nosys */
 	{ 0, (sy_call_t *)nosys },			/* 283 = nosys */
@@ -317,71 +319,71 @@ struct sysent sysent[] = {
 	{ 0, (sy_call_t *)nosys },			/* 294 = nosys */
 	{ 0, (sy_call_t *)nosys },			/* 295 = nosys */
 	{ 0, (sy_call_t *)nosys },			/* 296 = nosys */
-	{ 2, (sy_call_t *)fhstatfs },			/* 297 = fhstatfs */
-	{ 2, (sy_call_t *)fhopen },			/* 298 = fhopen */
-	{ 2, (sy_call_t *)fhstat },			/* 299 = fhstat */
-	{ 1, (sy_call_t *)modnext },			/* 300 = modnext */
-	{ 2, (sy_call_t *)modstat },			/* 301 = modstat */
-	{ 1, (sy_call_t *)modfnext },			/* 302 = modfnext */
-	{ 1, (sy_call_t *)modfind },			/* 303 = modfind */
-	{ 1, (sy_call_t *)kldload },			/* 304 = kldload */
-	{ 1, (sy_call_t *)kldunload },			/* 305 = kldunload */
-	{ 1, (sy_call_t *)kldfind },			/* 306 = kldfind */
-	{ 1, (sy_call_t *)kldnext },			/* 307 = kldnext */
-	{ 2, (sy_call_t *)kldstat },			/* 308 = kldstat */
-	{ 1, (sy_call_t *)kldfirstmod },		/* 309 = kldfirstmod */
-	{ 1, (sy_call_t *)getsid },			/* 310 = getsid */
-	{ 3, (sy_call_t *)setresuid },			/* 311 = setresuid */
-	{ 3, (sy_call_t *)setresgid },			/* 312 = setresgid */
+	{ AS(fhstatfs_args), (sy_call_t *)fhstatfs },	/* 297 = fhstatfs */
+	{ AS(fhopen_args), (sy_call_t *)fhopen },	/* 298 = fhopen */
+	{ AS(fhstat_args), (sy_call_t *)fhstat },	/* 299 = fhstat */
+	{ AS(modnext_args), (sy_call_t *)modnext },	/* 300 = modnext */
+	{ AS(modstat_args), (sy_call_t *)modstat },	/* 301 = modstat */
+	{ AS(modfnext_args), (sy_call_t *)modfnext },	/* 302 = modfnext */
+	{ AS(modfind_args), (sy_call_t *)modfind },	/* 303 = modfind */
+	{ AS(kldload_args), (sy_call_t *)kldload },	/* 304 = kldload */
+	{ AS(kldunload_args), (sy_call_t *)kldunload },	/* 305 = kldunload */
+	{ AS(kldfind_args), (sy_call_t *)kldfind },	/* 306 = kldfind */
+	{ AS(kldnext_args), (sy_call_t *)kldnext },	/* 307 = kldnext */
+	{ AS(kldstat_args), (sy_call_t *)kldstat },	/* 308 = kldstat */
+	{ AS(kldfirstmod_args), (sy_call_t *)kldfirstmod },	/* 309 = kldfirstmod */
+	{ AS(getsid_args), (sy_call_t *)getsid },	/* 310 = getsid */
+	{ AS(setresuid_args), (sy_call_t *)setresuid },	/* 311 = setresuid */
+	{ AS(setresgid_args), (sy_call_t *)setresgid },	/* 312 = setresgid */
 	{ 0, (sy_call_t *)nosys },			/* 313 = obsolete signanosleep */
-	{ 1, (sy_call_t *)aio_return },			/* 314 = aio_return */
-	{ 3, (sy_call_t *)aio_suspend },		/* 315 = aio_suspend */
-	{ 2, (sy_call_t *)aio_cancel },			/* 316 = aio_cancel */
-	{ 1, (sy_call_t *)aio_error },			/* 317 = aio_error */
-	{ 1, (sy_call_t *)aio_read },			/* 318 = aio_read */
-	{ 1, (sy_call_t *)aio_write },			/* 319 = aio_write */
-	{ 4, (sy_call_t *)lio_listio },			/* 320 = lio_listio */
+	{ AS(aio_return_args), (sy_call_t *)aio_return },	/* 314 = aio_return */
+	{ AS(aio_suspend_args), (sy_call_t *)aio_suspend },	/* 315 = aio_suspend */
+	{ AS(aio_cancel_args), (sy_call_t *)aio_cancel },	/* 316 = aio_cancel */
+	{ AS(aio_error_args), (sy_call_t *)aio_error },	/* 317 = aio_error */
+	{ AS(aio_read_args), (sy_call_t *)aio_read },	/* 318 = aio_read */
+	{ AS(aio_write_args), (sy_call_t *)aio_write },	/* 319 = aio_write */
+	{ AS(lio_listio_args), (sy_call_t *)lio_listio },	/* 320 = lio_listio */
 	{ 0, (sy_call_t *)yield },			/* 321 = yield */
-	{ 1, (sy_call_t *)thr_sleep },			/* 322 = thr_sleep */
-	{ 1, (sy_call_t *)thr_wakeup },			/* 323 = thr_wakeup */
-	{ 1, (sy_call_t *)mlockall },			/* 324 = mlockall */
+	{ AS(thr_sleep_args), (sy_call_t *)thr_sleep },	/* 322 = thr_sleep */
+	{ AS(thr_wakeup_args), (sy_call_t *)thr_wakeup },	/* 323 = thr_wakeup */
+	{ AS(mlockall_args), (sy_call_t *)mlockall },	/* 324 = mlockall */
 	{ 0, (sy_call_t *)munlockall },			/* 325 = munlockall */
-	{ 2, (sy_call_t *)__getcwd },			/* 326 = __getcwd */
-	{ 2, (sy_call_t *)sched_setparam },		/* 327 = sched_setparam */
-	{ 2, (sy_call_t *)sched_getparam },		/* 328 = sched_getparam */
-	{ 3, (sy_call_t *)sched_setscheduler },		/* 329 = sched_setscheduler */
-	{ 1, (sy_call_t *)sched_getscheduler },		/* 330 = sched_getscheduler */
+	{ AS(__getcwd_args), (sy_call_t *)__getcwd },	/* 326 = __getcwd */
+	{ AS(sched_setparam_args), (sy_call_t *)sched_setparam },	/* 327 = sched_setparam */
+	{ AS(sched_getparam_args), (sy_call_t *)sched_getparam },	/* 328 = sched_getparam */
+	{ AS(sched_setscheduler_args), (sy_call_t *)sched_setscheduler },	/* 329 = sched_setscheduler */
+	{ AS(sched_getscheduler_args), (sy_call_t *)sched_getscheduler },	/* 330 = sched_getscheduler */
 	{ 0, (sy_call_t *)sched_yield },		/* 331 = sched_yield */
-	{ 1, (sy_call_t *)sched_get_priority_max },		/* 332 = sched_get_priority_max */
-	{ 1, (sy_call_t *)sched_get_priority_min },		/* 333 = sched_get_priority_min */
-	{ 2, (sy_call_t *)sched_rr_get_interval },		/* 334 = sched_rr_get_interval */
-	{ 2, (sy_call_t *)utrace },			/* 335 = utrace */
-	{ 8, (sy_call_t *)sendfile },			/* 336 = sendfile */
-	{ 3, (sy_call_t *)kldsym },			/* 337 = kldsym */
-	{ 1, (sy_call_t *)jail },			/* 338 = jail */
+	{ AS(sched_get_priority_max_args), (sy_call_t *)sched_get_priority_max },	/* 332 = sched_get_priority_max */
+	{ AS(sched_get_priority_min_args), (sy_call_t *)sched_get_priority_min },	/* 333 = sched_get_priority_min */
+	{ AS(sched_rr_get_interval_args), (sy_call_t *)sched_rr_get_interval },	/* 334 = sched_rr_get_interval */
+	{ AS(utrace_args), (sy_call_t *)utrace },	/* 335 = utrace */
+	{ AS(sendfile_args), (sy_call_t *)sendfile },	/* 336 = sendfile */
+	{ AS(kldsym_args), (sy_call_t *)kldsym },	/* 337 = kldsym */
+	{ AS(jail_args), (sy_call_t *)jail },		/* 338 = jail */
 	{ 0, (sy_call_t *)nosys },			/* 339 = pioctl */
-	{ SYF_MPSAFE | 3, (sy_call_t *)sigprocmask },	/* 340 = sigprocmask */
-	{ 1, (sy_call_t *)sigsuspend },			/* 341 = sigsuspend */
-	{ 3, (sy_call_t *)sigaction },			/* 342 = sigaction */
-	{ 1, (sy_call_t *)sigpending },			/* 343 = sigpending */
-	{ 1, (sy_call_t *)sigreturn },			/* 344 = sigreturn */
+	{ SYF_MPSAFE | AS(sigprocmask_args), (sy_call_t *)sigprocmask },	/* 340 = sigprocmask */
+	{ AS(sigsuspend_args), (sy_call_t *)sigsuspend },	/* 341 = sigsuspend */
+	{ AS(sigaction_args), (sy_call_t *)sigaction },	/* 342 = sigaction */
+	{ AS(sigpending_args), (sy_call_t *)sigpending },	/* 343 = sigpending */
+	{ AS(sigreturn_args), (sy_call_t *)sigreturn },	/* 344 = sigreturn */
 	{ 0, (sy_call_t *)nosys },			/* 345 = sigtimedwait */
 	{ 0, (sy_call_t *)nosys },			/* 346 = sigwaitinfo */
-	{ 3, (sy_call_t *)__acl_get_file },		/* 347 = __acl_get_file */
-	{ 3, (sy_call_t *)__acl_set_file },		/* 348 = __acl_set_file */
-	{ 3, (sy_call_t *)__acl_get_fd },		/* 349 = __acl_get_fd */
-	{ 3, (sy_call_t *)__acl_set_fd },		/* 350 = __acl_set_fd */
-	{ 2, (sy_call_t *)__acl_delete_file },		/* 351 = __acl_delete_file */
-	{ 2, (sy_call_t *)__acl_delete_fd },		/* 352 = __acl_delete_fd */
-	{ 3, (sy_call_t *)__acl_aclcheck_file },		/* 353 = __acl_aclcheck_file */
-	{ 3, (sy_call_t *)__acl_aclcheck_fd },		/* 354 = __acl_aclcheck_fd */
-	{ 4, (sy_call_t *)extattrctl },			/* 355 = extattrctl */
-	{ 4, (sy_call_t *)extattr_set_file },		/* 356 = extattr_set_file */
-	{ 4, (sy_call_t *)extattr_get_file },		/* 357 = extattr_get_file */
-	{ 2, (sy_call_t *)extattr_delete_file },		/* 358 = extattr_delete_file */
-	{ 2, (sy_call_t *)aio_waitcomplete },		/* 359 = aio_waitcomplete */
-	{ 3, (sy_call_t *)getresuid },			/* 360 = getresuid */
-	{ 3, (sy_call_t *)getresgid },			/* 361 = getresgid */
+	{ AS(__acl_get_file_args), (sy_call_t *)__acl_get_file },	/* 347 = __acl_get_file */
+	{ AS(__acl_set_file_args), (sy_call_t *)__acl_set_file },	/* 348 = __acl_set_file */
+	{ AS(__acl_get_fd_args), (sy_call_t *)__acl_get_fd },	/* 349 = __acl_get_fd */
+	{ AS(__acl_set_fd_args), (sy_call_t *)__acl_set_fd },	/* 350 = __acl_set_fd */
+	{ AS(__acl_delete_file_args), (sy_call_t *)__acl_delete_file },	/* 351 = __acl_delete_file */
+	{ AS(__acl_delete_fd_args), (sy_call_t *)__acl_delete_fd },	/* 352 = __acl_delete_fd */
+	{ AS(__acl_aclcheck_file_args), (sy_call_t *)__acl_aclcheck_file },	/* 353 = __acl_aclcheck_file */
+	{ AS(__acl_aclcheck_fd_args), (sy_call_t *)__acl_aclcheck_fd },	/* 354 = __acl_aclcheck_fd */
+	{ AS(extattrctl_args), (sy_call_t *)extattrctl },	/* 355 = extattrctl */
+	{ AS(extattr_set_file_args), (sy_call_t *)extattr_set_file },	/* 356 = extattr_set_file */
+	{ AS(extattr_get_file_args), (sy_call_t *)extattr_get_file },	/* 357 = extattr_get_file */
+	{ AS(extattr_delete_file_args), (sy_call_t *)extattr_delete_file },	/* 358 = extattr_delete_file */
+	{ AS(aio_waitcomplete_args), (sy_call_t *)aio_waitcomplete },	/* 359 = aio_waitcomplete */
+	{ AS(getresuid_args), (sy_call_t *)getresuid },	/* 360 = getresuid */
+	{ AS(getresgid_args), (sy_call_t *)getresgid },	/* 361 = getresgid */
 	{ 0, (sy_call_t *)kqueue },			/* 362 = kqueue */
-	{ 6, (sy_call_t *)kevent },			/* 363 = kevent */
+	{ AS(kevent_args), (sy_call_t *)kevent },	/* 363 = kevent */
 };
diff --git a/sys/svr4/svr4_proto.h b/sys/svr4/svr4_proto.h
index 407513a..26b06dd 100644
--- a/sys/svr4/svr4_proto.h
+++ b/sys/svr4/svr4_proto.h
@@ -11,6 +11,8 @@
 
 #include <sys/signal.h>
 
+#include <sys/acl.h>
+
 struct proc;
 
 #define	PAD_(t)	(sizeof(register_t) <= sizeof(t) ? \
diff --git a/sys/svr4/svr4_sysent.c b/sys/svr4/svr4_sysent.c
index 84db78b..34a34cd 100644
--- a/sys/svr4/svr4_sysent.c
+++ b/sys/svr4/svr4_sysent.c
@@ -15,76 +15,78 @@
 #include <svr4/svr4_signal.h>
 #include <svr4/svr4_proto.h>
 
+#define AS(name) (sizeof(struct name) / sizeof(register_t))
+
 /* The casts are bogus but will do for now. */
 struct sysent svr4_sysent[] = {
 	{ 0, (sy_call_t *)nosys },			/* 0 = unused */
-	{ 1, (sy_call_t *)exit },			/* 1 = exit */
+	{ AS(exit_args), (sy_call_t *)exit },		/* 1 = exit */
 	{ 0, (sy_call_t *)fork },			/* 2 = fork */
-	{ 3, (sy_call_t *)read },			/* 3 = read */
-	{ 3, (sy_call_t *)write },			/* 4 = write */
-	{ 3, (sy_call_t *)svr4_sys_open },		/* 5 = svr4_sys_open */
-	{ 1, (sy_call_t *)close },			/* 6 = close */
-	{ 1, (sy_call_t *)svr4_sys_wait },		/* 7 = svr4_sys_wait */
-	{ 2, (sy_call_t *)svr4_sys_creat },		/* 8 = svr4_sys_creat */
-	{ 2, (sy_call_t *)link },			/* 9 = link */
-	{ 1, (sy_call_t *)unlink },			/* 10 = unlink */
-	{ 2, (sy_call_t *)svr4_sys_execv },		/* 11 = svr4_sys_execv */
-	{ 1, (sy_call_t *)chdir },			/* 12 = chdir */
-	{ 1, (sy_call_t *)svr4_sys_time },		/* 13 = svr4_sys_time */
-	{ 3, (sy_call_t *)svr4_sys_mknod },		/* 14 = svr4_sys_mknod */
-	{ 2, (sy_call_t *)chmod },			/* 15 = chmod */
-	{ 3, (sy_call_t *)chown },			/* 16 = chown */
-	{ 1, (sy_call_t *)svr4_sys_break },		/* 17 = svr4_sys_break */
-	{ 2, (sy_call_t *)svr4_sys_stat },		/* 18 = svr4_sys_stat */
-	{ 3, (sy_call_t *)lseek },			/* 19 = lseek */
+	{ AS(read_args), (sy_call_t *)read },		/* 3 = read */
+	{ AS(write_args), (sy_call_t *)write },		/* 4 = write */
+	{ AS(svr4_sys_open_args), (sy_call_t *)svr4_sys_open },	/* 5 = svr4_sys_open */
+	{ AS(close_args), (sy_call_t *)close },		/* 6 = close */
+	{ AS(svr4_sys_wait_args), (sy_call_t *)svr4_sys_wait },	/* 7 = svr4_sys_wait */
+	{ AS(svr4_sys_creat_args), (sy_call_t *)svr4_sys_creat },	/* 8 = svr4_sys_creat */
+	{ AS(link_args), (sy_call_t *)link },		/* 9 = link */
+	{ AS(unlink_args), (sy_call_t *)unlink },	/* 10 = unlink */
+	{ AS(svr4_sys_execv_args), (sy_call_t *)svr4_sys_execv },	/* 11 = svr4_sys_execv */
+	{ AS(chdir_args), (sy_call_t *)chdir },		/* 12 = chdir */
+	{ AS(svr4_sys_time_args), (sy_call_t *)svr4_sys_time },	/* 13 = svr4_sys_time */
+	{ AS(svr4_sys_mknod_args), (sy_call_t *)svr4_sys_mknod },	/* 14 = svr4_sys_mknod */
+	{ AS(chmod_args), (sy_call_t *)chmod },		/* 15 = chmod */
+	{ AS(chown_args), (sy_call_t *)chown },		/* 16 = chown */
+	{ AS(svr4_sys_break_args), (sy_call_t *)svr4_sys_break },	/* 17 = svr4_sys_break */
+	{ AS(svr4_sys_stat_args), (sy_call_t *)svr4_sys_stat },	/* 18 = svr4_sys_stat */
+	{ AS(lseek_args), (sy_call_t *)lseek },		/* 19 = lseek */
 	{ 0, (sy_call_t *)getpid },			/* 20 = getpid */
 	{ 0, (sy_call_t *)nosys },			/* 21 = old_mount */
 	{ 0, (sy_call_t *)nosys },			/* 22 = sysv_umount */
-	{ 1, (sy_call_t *)setuid },			/* 23 = setuid */
+	{ AS(setuid_args), (sy_call_t *)setuid },	/* 23 = setuid */
 	{ 0, (sy_call_t *)getuid },			/* 24 = getuid */
 	{ 0, (sy_call_t *)nosys },			/* 25 = stime */
 	{ 0, (sy_call_t *)nosys },			/* 26 = ptrace */
-	{ 1, (sy_call_t *)svr4_sys_alarm },		/* 27 = svr4_sys_alarm */
-	{ 2, (sy_call_t *)svr4_sys_fstat },		/* 28 = svr4_sys_fstat */
+	{ AS(svr4_sys_alarm_args), (sy_call_t *)svr4_sys_alarm },	/* 27 = svr4_sys_alarm */
+	{ AS(svr4_sys_fstat_args), (sy_call_t *)svr4_sys_fstat },	/* 28 = svr4_sys_fstat */
 	{ 0, (sy_call_t *)svr4_sys_pause },		/* 29 = svr4_sys_pause */
-	{ 2, (sy_call_t *)svr4_sys_utime },		/* 30 = svr4_sys_utime */
+	{ AS(svr4_sys_utime_args), (sy_call_t *)svr4_sys_utime },	/* 30 = svr4_sys_utime */
 	{ 0, (sy_call_t *)nosys },			/* 31 = stty */
 	{ 0, (sy_call_t *)nosys },			/* 32 = gtty */
-	{ 2, (sy_call_t *)svr4_sys_access },		/* 33 = svr4_sys_access */
-	{ 1, (sy_call_t *)svr4_sys_nice },		/* 34 = svr4_sys_nice */
+	{ AS(svr4_sys_access_args), (sy_call_t *)svr4_sys_access },	/* 33 = svr4_sys_access */
+	{ AS(svr4_sys_nice_args), (sy_call_t *)svr4_sys_nice },	/* 34 = svr4_sys_nice */
 	{ 0, (sy_call_t *)nosys },			/* 35 = statfs */
 	{ 0, (sy_call_t *)sync },			/* 36 = sync */
-	{ 2, (sy_call_t *)svr4_sys_kill },		/* 37 = svr4_sys_kill */
+	{ AS(svr4_sys_kill_args), (sy_call_t *)svr4_sys_kill },	/* 37 = svr4_sys_kill */
 	{ 0, (sy_call_t *)nosys },			/* 38 = fstatfs */
-	{ 3, (sy_call_t *)svr4_sys_pgrpsys },		/* 39 = svr4_sys_pgrpsys */
+	{ AS(svr4_sys_pgrpsys_args), (sy_call_t *)svr4_sys_pgrpsys },	/* 39 = svr4_sys_pgrpsys */
 	{ 0, (sy_call_t *)nosys },			/* 40 = xenix */
-	{ 1, (sy_call_t *)dup },			/* 41 = dup */
+	{ AS(dup_args), (sy_call_t *)dup },		/* 41 = dup */
 	{ 0, (sy_call_t *)pipe },			/* 42 = pipe */
-	{ 1, (sy_call_t *)svr4_sys_times },		/* 43 = svr4_sys_times */
+	{ AS(svr4_sys_times_args), (sy_call_t *)svr4_sys_times },	/* 43 = svr4_sys_times */
 	{ 0, (sy_call_t *)nosys },			/* 44 = profil */
 	{ 0, (sy_call_t *)nosys },			/* 45 = plock */
-	{ 1, (sy_call_t *)setgid },			/* 46 = setgid */
+	{ AS(setgid_args), (sy_call_t *)setgid },	/* 46 = setgid */
 	{ 0, (sy_call_t *)getgid },			/* 47 = getgid */
-	{ 2, (sy_call_t *)svr4_sys_signal },		/* 48 = svr4_sys_signal */
+	{ AS(svr4_sys_signal_args), (sy_call_t *)svr4_sys_signal },	/* 48 = svr4_sys_signal */
 #if defined(NOTYET)
-	{ 5, (sy_call_t *)svr4_sys_msgsys },		/* 49 = svr4_sys_msgsys */
+	{ AS(svr4_sys_msgsys_args), (sy_call_t *)svr4_sys_msgsys },	/* 49 = svr4_sys_msgsys */
 #else
 	{ 0, (sy_call_t *)nosys },			/* 49 = msgsys */
 #endif
-	{ 2, (sy_call_t *)svr4_sys_sysarch },		/* 50 = svr4_sys_sysarch */
+	{ AS(svr4_sys_sysarch_args), (sy_call_t *)svr4_sys_sysarch },	/* 50 = svr4_sys_sysarch */
 	{ 0, (sy_call_t *)nosys },			/* 51 = acct */
 	{ 0, (sy_call_t *)nosys },			/* 52 = shmsys */
 	{ 0, (sy_call_t *)nosys },			/* 53 = semsys */
-	{ 3, (sy_call_t *)svr4_sys_ioctl },		/* 54 = svr4_sys_ioctl */
+	{ AS(svr4_sys_ioctl_args), (sy_call_t *)svr4_sys_ioctl },	/* 54 = svr4_sys_ioctl */
 	{ 0, (sy_call_t *)nosys },			/* 55 = uadmin */
 	{ 0, (sy_call_t *)nosys },			/* 56 = exch */
-	{ 4, (sy_call_t *)svr4_sys_utssys },		/* 57 = svr4_sys_utssys */
-	{ 1, (sy_call_t *)fsync },			/* 58 = fsync */
-	{ 3, (sy_call_t *)svr4_sys_execve },		/* 59 = svr4_sys_execve */
-	{ 1, (sy_call_t *)umask },			/* 60 = umask */
-	{ 1, (sy_call_t *)chroot },			/* 61 = chroot */
-	{ 3, (sy_call_t *)svr4_sys_fcntl },		/* 62 = svr4_sys_fcntl */
-	{ 2, (sy_call_t *)svr4_sys_ulimit },		/* 63 = svr4_sys_ulimit */
+	{ AS(svr4_sys_utssys_args), (sy_call_t *)svr4_sys_utssys },	/* 57 = svr4_sys_utssys */
+	{ AS(fsync_args), (sy_call_t *)fsync },		/* 58 = fsync */
+	{ AS(svr4_sys_execve_args), (sy_call_t *)svr4_sys_execve },	/* 59 = svr4_sys_execve */
+	{ AS(umask_args), (sy_call_t *)umask },		/* 60 = umask */
+	{ AS(chroot_args), (sy_call_t *)chroot },	/* 61 = chroot */
+	{ AS(svr4_sys_fcntl_args), (sy_call_t *)svr4_sys_fcntl },	/* 62 = svr4_sys_fcntl */
+	{ AS(svr4_sys_ulimit_args), (sy_call_t *)svr4_sys_ulimit },	/* 63 = svr4_sys_ulimit */
 	{ 0, (sy_call_t *)nosys },			/* 64 = reserved */
 	{ 0, (sy_call_t *)nosys },			/* 65 = reserved */
 	{ 0, (sy_call_t *)nosys },			/* 66 = reserved */
@@ -100,69 +102,69 @@ struct sysent svr4_sysent[] = {
 	{ 0, (sy_call_t *)nosys },			/* 76 = rdebug */
 	{ 0, (sy_call_t *)nosys },			/* 77 = rfstop */
 	{ 0, (sy_call_t *)nosys },			/* 78 = rfsys */
-	{ 1, (sy_call_t *)rmdir },			/* 79 = rmdir */
-	{ 2, (sy_call_t *)mkdir },			/* 80 = mkdir */
-	{ 3, (sy_call_t *)svr4_sys_getdents },		/* 81 = svr4_sys_getdents */
+	{ AS(rmdir_args), (sy_call_t *)rmdir },		/* 79 = rmdir */
+	{ AS(mkdir_args), (sy_call_t *)mkdir },		/* 80 = mkdir */
+	{ AS(svr4_sys_getdents_args), (sy_call_t *)svr4_sys_getdents },	/* 81 = svr4_sys_getdents */
 	{ 0, (sy_call_t *)nosys },			/* 82 = libattach */
 	{ 0, (sy_call_t *)nosys },			/* 83 = libdetach */
 	{ 0, (sy_call_t *)nosys },			/* 84 = sysfs */
-	{ 4, (sy_call_t *)svr4_sys_getmsg },		/* 85 = svr4_sys_getmsg */
-	{ 4, (sy_call_t *)svr4_sys_putmsg },		/* 86 = svr4_sys_putmsg */
-	{ 3, (sy_call_t *)svr4_sys_poll },		/* 87 = svr4_sys_poll */
-	{ 2, (sy_call_t *)svr4_sys_lstat },		/* 88 = svr4_sys_lstat */
-	{ 2, (sy_call_t *)symlink },			/* 89 = symlink */
-	{ 3, (sy_call_t *)readlink },			/* 90 = readlink */
-	{ 2, (sy_call_t *)getgroups },			/* 91 = getgroups */
-	{ 2, (sy_call_t *)setgroups },			/* 92 = setgroups */
-	{ 2, (sy_call_t *)fchmod },			/* 93 = fchmod */
-	{ 3, (sy_call_t *)fchown },			/* 94 = fchown */
-	{ 3, (sy_call_t *)svr4_sys_sigprocmask },		/* 95 = svr4_sys_sigprocmask */
-	{ 1, (sy_call_t *)svr4_sys_sigsuspend },		/* 96 = svr4_sys_sigsuspend */
-	{ 2, (sy_call_t *)svr4_sys_sigaltstack },		/* 97 = svr4_sys_sigaltstack */
-	{ 3, (sy_call_t *)svr4_sys_sigaction },		/* 98 = svr4_sys_sigaction */
-	{ 2, (sy_call_t *)svr4_sys_sigpending },		/* 99 = svr4_sys_sigpending */
-	{ 2, (sy_call_t *)svr4_sys_context },		/* 100 = svr4_sys_context */
+	{ AS(svr4_sys_getmsg_args), (sy_call_t *)svr4_sys_getmsg },	/* 85 = svr4_sys_getmsg */
+	{ AS(svr4_sys_putmsg_args), (sy_call_t *)svr4_sys_putmsg },	/* 86 = svr4_sys_putmsg */
+	{ AS(svr4_sys_poll_args), (sy_call_t *)svr4_sys_poll },	/* 87 = svr4_sys_poll */
+	{ AS(svr4_sys_lstat_args), (sy_call_t *)svr4_sys_lstat },	/* 88 = svr4_sys_lstat */
+	{ AS(symlink_args), (sy_call_t *)symlink },	/* 89 = symlink */
+	{ AS(readlink_args), (sy_call_t *)readlink },	/* 90 = readlink */
+	{ AS(getgroups_args), (sy_call_t *)getgroups },	/* 91 = getgroups */
+	{ AS(setgroups_args), (sy_call_t *)setgroups },	/* 92 = setgroups */
+	{ AS(fchmod_args), (sy_call_t *)fchmod },	/* 93 = fchmod */
+	{ AS(fchown_args), (sy_call_t *)fchown },	/* 94 = fchown */
+	{ AS(svr4_sys_sigprocmask_args), (sy_call_t *)svr4_sys_sigprocmask },	/* 95 = svr4_sys_sigprocmask */
+	{ AS(svr4_sys_sigsuspend_args), (sy_call_t *)svr4_sys_sigsuspend },	/* 96 = svr4_sys_sigsuspend */
+	{ AS(svr4_sys_sigaltstack_args), (sy_call_t *)svr4_sys_sigaltstack },	/* 97 = svr4_sys_sigaltstack */
+	{ AS(svr4_sys_sigaction_args), (sy_call_t *)svr4_sys_sigaction },	/* 98 = svr4_sys_sigaction */
+	{ AS(svr4_sys_sigpending_args), (sy_call_t *)svr4_sys_sigpending },	/* 99 = svr4_sys_sigpending */
+	{ AS(svr4_sys_context_args), (sy_call_t *)svr4_sys_context },	/* 100 = svr4_sys_context */
 	{ 0, (sy_call_t *)nosys },			/* 101 = evsys */
 	{ 0, (sy_call_t *)nosys },			/* 102 = evtrapret */
-	{ 2, (sy_call_t *)svr4_sys_statvfs },		/* 103 = svr4_sys_statvfs */
-	{ 2, (sy_call_t *)svr4_sys_fstatvfs },		/* 104 = svr4_sys_fstatvfs */
+	{ AS(svr4_sys_statvfs_args), (sy_call_t *)svr4_sys_statvfs },	/* 103 = svr4_sys_statvfs */
+	{ AS(svr4_sys_fstatvfs_args), (sy_call_t *)svr4_sys_fstatvfs },	/* 104 = svr4_sys_fstatvfs */
 	{ 0, (sy_call_t *)nosys },			/* 105 = whoknows */
 	{ 0, (sy_call_t *)nosys },			/* 106 = nfssvc */
-	{ 4, (sy_call_t *)svr4_sys_waitsys },		/* 107 = svr4_sys_waitsys */
+	{ AS(svr4_sys_waitsys_args), (sy_call_t *)svr4_sys_waitsys },	/* 107 = svr4_sys_waitsys */
 	{ 0, (sy_call_t *)nosys },			/* 108 = sigsendsys */
-	{ 5, (sy_call_t *)svr4_sys_hrtsys },		/* 109 = svr4_sys_hrtsys */
+	{ AS(svr4_sys_hrtsys_args), (sy_call_t *)svr4_sys_hrtsys },	/* 109 = svr4_sys_hrtsys */
 	{ 0, (sy_call_t *)nosys },			/* 110 = acancel */
 	{ 0, (sy_call_t *)nosys },			/* 111 = async */
 	{ 0, (sy_call_t *)nosys },			/* 112 = priocntlsys */
-	{ 2, (sy_call_t *)svr4_sys_pathconf },		/* 113 = svr4_sys_pathconf */
+	{ AS(svr4_sys_pathconf_args), (sy_call_t *)svr4_sys_pathconf },	/* 113 = svr4_sys_pathconf */
 	{ 0, (sy_call_t *)nosys },			/* 114 = mincore */
-	{ 6, (sy_call_t *)svr4_sys_mmap },		/* 115 = svr4_sys_mmap */
-	{ 3, (sy_call_t *)mprotect },			/* 116 = mprotect */
-	{ 2, (sy_call_t *)munmap },			/* 117 = munmap */
-	{ 2, (sy_call_t *)svr4_sys_fpathconf },		/* 118 = svr4_sys_fpathconf */
+	{ AS(svr4_sys_mmap_args), (sy_call_t *)svr4_sys_mmap },	/* 115 = svr4_sys_mmap */
+	{ AS(mprotect_args), (sy_call_t *)mprotect },	/* 116 = mprotect */
+	{ AS(munmap_args), (sy_call_t *)munmap },	/* 117 = munmap */
+	{ AS(svr4_sys_fpathconf_args), (sy_call_t *)svr4_sys_fpathconf },	/* 118 = svr4_sys_fpathconf */
 	{ 0, (sy_call_t *)vfork },			/* 119 = vfork */
-	{ 1, (sy_call_t *)fchdir },			/* 120 = fchdir */
-	{ 3, (sy_call_t *)readv },			/* 121 = readv */
-	{ 3, (sy_call_t *)writev },			/* 122 = writev */
-	{ 3, (sy_call_t *)svr4_sys_xstat },		/* 123 = svr4_sys_xstat */
-	{ 3, (sy_call_t *)svr4_sys_lxstat },		/* 124 = svr4_sys_lxstat */
-	{ 3, (sy_call_t *)svr4_sys_fxstat },		/* 125 = svr4_sys_fxstat */
-	{ 4, (sy_call_t *)svr4_sys_xmknod },		/* 126 = svr4_sys_xmknod */
+	{ AS(fchdir_args), (sy_call_t *)fchdir },	/* 120 = fchdir */
+	{ AS(readv_args), (sy_call_t *)readv },		/* 121 = readv */
+	{ AS(writev_args), (sy_call_t *)writev },	/* 122 = writev */
+	{ AS(svr4_sys_xstat_args), (sy_call_t *)svr4_sys_xstat },	/* 123 = svr4_sys_xstat */
+	{ AS(svr4_sys_lxstat_args), (sy_call_t *)svr4_sys_lxstat },	/* 124 = svr4_sys_lxstat */
+	{ AS(svr4_sys_fxstat_args), (sy_call_t *)svr4_sys_fxstat },	/* 125 = svr4_sys_fxstat */
+	{ AS(svr4_sys_xmknod_args), (sy_call_t *)svr4_sys_xmknod },	/* 126 = svr4_sys_xmknod */
 	{ 0, (sy_call_t *)nosys },			/* 127 = clocal */
-	{ 2, (sy_call_t *)svr4_sys_setrlimit },		/* 128 = svr4_sys_setrlimit */
-	{ 2, (sy_call_t *)svr4_sys_getrlimit },		/* 129 = svr4_sys_getrlimit */
-	{ 3, (sy_call_t *)lchown },			/* 130 = lchown */
-	{ 6, (sy_call_t *)svr4_sys_memcntl },		/* 131 = svr4_sys_memcntl */
+	{ AS(svr4_sys_setrlimit_args), (sy_call_t *)svr4_sys_setrlimit },	/* 128 = svr4_sys_setrlimit */
+	{ AS(svr4_sys_getrlimit_args), (sy_call_t *)svr4_sys_getrlimit },	/* 129 = svr4_sys_getrlimit */
+	{ AS(lchown_args), (sy_call_t *)lchown },	/* 130 = lchown */
+	{ AS(svr4_sys_memcntl_args), (sy_call_t *)svr4_sys_memcntl },	/* 131 = svr4_sys_memcntl */
 	{ 0, (sy_call_t *)nosys },			/* 132 = getpmsg */
 	{ 0, (sy_call_t *)nosys },			/* 133 = putpmsg */
-	{ 2, (sy_call_t *)rename },			/* 134 = rename */
-	{ 2, (sy_call_t *)svr4_sys_uname },		/* 135 = svr4_sys_uname */
-	{ 1, (sy_call_t *)setegid },			/* 136 = setegid */
-	{ 1, (sy_call_t *)svr4_sys_sysconfig },		/* 137 = svr4_sys_sysconfig */
-	{ 2, (sy_call_t *)adjtime },			/* 138 = adjtime */
-	{ 3, (sy_call_t *)svr4_sys_systeminfo },		/* 139 = svr4_sys_systeminfo */
+	{ AS(rename_args), (sy_call_t *)rename },	/* 134 = rename */
+	{ AS(svr4_sys_uname_args), (sy_call_t *)svr4_sys_uname },	/* 135 = svr4_sys_uname */
+	{ AS(setegid_args), (sy_call_t *)setegid },	/* 136 = setegid */
+	{ AS(svr4_sys_sysconfig_args), (sy_call_t *)svr4_sys_sysconfig },	/* 137 = svr4_sys_sysconfig */
+	{ AS(adjtime_args), (sy_call_t *)adjtime },	/* 138 = adjtime */
+	{ AS(svr4_sys_systeminfo_args), (sy_call_t *)svr4_sys_systeminfo },	/* 139 = svr4_sys_systeminfo */
 	{ 0, (sy_call_t *)nosys },			/* 140 = notused */
-	{ 1, (sy_call_t *)seteuid },			/* 141 = seteuid */
+	{ AS(seteuid_args), (sy_call_t *)seteuid },	/* 141 = seteuid */
 	{ 0, (sy_call_t *)nosys },			/* 142 = vtrace */
 	{ 0, (sy_call_t *)nosys },			/* 143 = { */
 	{ 0, (sy_call_t *)nosys },			/* 144 = sigtimedwait */
@@ -174,12 +176,12 @@ struct sysent svr4_sysent[] = {
 	{ 0, (sy_call_t *)nosys },			/* 150 = notused */
 	{ 0, (sy_call_t *)nosys },			/* 151 = notused */
 	{ 0, (sy_call_t *)nosys },			/* 152 = modctl */
-	{ 1, (sy_call_t *)svr4_sys_fchroot },		/* 153 = svr4_sys_fchroot */
-	{ 2, (sy_call_t *)svr4_sys_utimes },		/* 154 = svr4_sys_utimes */
+	{ AS(svr4_sys_fchroot_args), (sy_call_t *)svr4_sys_fchroot },	/* 153 = svr4_sys_fchroot */
+	{ AS(svr4_sys_utimes_args), (sy_call_t *)svr4_sys_utimes },	/* 154 = svr4_sys_utimes */
 	{ 0, (sy_call_t *)svr4_sys_vhangup },		/* 155 = svr4_sys_vhangup */
-	{ 1, (sy_call_t *)svr4_sys_gettimeofday },		/* 156 = svr4_sys_gettimeofday */
-	{ 2, (sy_call_t *)getitimer },			/* 157 = getitimer */
-	{ 3, (sy_call_t *)setitimer },			/* 158 = setitimer */
+	{ AS(svr4_sys_gettimeofday_args), (sy_call_t *)svr4_sys_gettimeofday },	/* 156 = svr4_sys_gettimeofday */
+	{ AS(getitimer_args), (sy_call_t *)getitimer },	/* 157 = getitimer */
+	{ AS(setitimer_args), (sy_call_t *)setitimer },	/* 158 = setitimer */
 	{ 0, (sy_call_t *)nosys },			/* 159 = lwp_create */
 	{ 0, (sy_call_t *)nosys },			/* 160 = lwp_exit */
 	{ 0, (sy_call_t *)nosys },			/* 161 = lwp_suspend */
@@ -196,7 +198,7 @@ struct sysent svr4_sysent[] = {
 	{ 0, (sy_call_t *)nosys },			/* 172 = lwp_cond_broadcast */
 	{ 0, (sy_call_t *)nosys },			/* 173 = { */
 	{ 0, (sy_call_t *)nosys },			/* 174 = { */
-	{ 4, (sy_call_t *)svr4_sys_llseek },		/* 175 = svr4_sys_llseek */
+	{ AS(svr4_sys_llseek_args), (sy_call_t *)svr4_sys_llseek },	/* 175 = svr4_sys_llseek */
 	{ 0, (sy_call_t *)nosys },			/* 176 = inst_sync */
 	{ 0, (sy_call_t *)nosys },			/* 177 = whoknows */
 	{ 0, (sy_call_t *)nosys },			/* 178 = kaio */
@@ -206,8 +208,8 @@ struct sysent svr4_sysent[] = {
 	{ 0, (sy_call_t *)nosys },			/* 182 = whoknows */
 	{ 0, (sy_call_t *)nosys },			/* 183 = whoknows */
 	{ 0, (sy_call_t *)nosys },			/* 184 = tsolsys */
-	{ 4, (sy_call_t *)svr4_sys_acl },		/* 185 = svr4_sys_acl */
-	{ 6, (sy_call_t *)svr4_sys_auditsys },		/* 186 = svr4_sys_auditsys */
+	{ AS(svr4_sys_acl_args), (sy_call_t *)svr4_sys_acl },	/* 185 = svr4_sys_acl */
+	{ AS(svr4_sys_auditsys_args), (sy_call_t *)svr4_sys_auditsys },	/* 186 = svr4_sys_auditsys */
 	{ 0, (sy_call_t *)nosys },			/* 187 = processor_bind */
 	{ 0, (sy_call_t *)nosys },			/* 188 = processor_info */
 	{ 0, (sy_call_t *)nosys },			/* 189 = p_online */
@@ -220,54 +222,54 @@ struct sysent svr4_sysent[] = {
 	{ 0, (sy_call_t *)nosys },			/* 196 = timer_settime */
 	{ 0, (sy_call_t *)nosys },			/* 197 = timer_gettime */
 	{ 0, (sy_call_t *)nosys },			/* 198 = timer_overrun */
-	{ 2, (sy_call_t *)nanosleep },			/* 199 = nanosleep */
-	{ 4, (sy_call_t *)svr4_sys_facl },		/* 200 = svr4_sys_facl */
+	{ AS(nanosleep_args), (sy_call_t *)nanosleep },	/* 199 = nanosleep */
+	{ AS(svr4_sys_facl_args), (sy_call_t *)svr4_sys_facl },	/* 200 = svr4_sys_facl */
 	{ 0, (sy_call_t *)nosys },			/* 201 = door */
-	{ 2, (sy_call_t *)setreuid },			/* 202 = setreuid */
-	{ 2, (sy_call_t *)setregid },			/* 203 = setregid */
+	{ AS(setreuid_args), (sy_call_t *)setreuid },	/* 202 = setreuid */
+	{ AS(setregid_args), (sy_call_t *)setregid },	/* 203 = setregid */
 	{ 0, (sy_call_t *)nosys },			/* 204 = install_utrap */
 	{ 0, (sy_call_t *)nosys },			/* 205 = signotify */
 	{ 0, (sy_call_t *)nosys },			/* 206 = schedctl */
 	{ 0, (sy_call_t *)nosys },			/* 207 = pset */
 	{ 0, (sy_call_t *)nosys },			/* 208 = whoknows */
-	{ 3, (sy_call_t *)svr4_sys_resolvepath },		/* 209 = svr4_sys_resolvepath */
+	{ AS(svr4_sys_resolvepath_args), (sy_call_t *)svr4_sys_resolvepath },	/* 209 = svr4_sys_resolvepath */
 	{ 0, (sy_call_t *)nosys },			/* 210 = signotifywait */
 	{ 0, (sy_call_t *)nosys },			/* 211 = lwp_sigredirect */
 	{ 0, (sy_call_t *)nosys },			/* 212 = lwp_alarm */
-	{ 3, (sy_call_t *)svr4_sys_getdents64 },		/* 213 = svr4_sys_getdents64 */
-	{ 6, (sy_call_t *)svr4_sys_mmap64 },		/* 214 = svr4_sys_mmap64 */
-	{ 2, (sy_call_t *)svr4_sys_stat64 },		/* 215 = svr4_sys_stat64 */
-	{ 2, (sy_call_t *)svr4_sys_lstat64 },		/* 216 = svr4_sys_lstat64 */
-	{ 2, (sy_call_t *)svr4_sys_fstat64 },		/* 217 = svr4_sys_fstat64 */
-	{ 2, (sy_call_t *)svr4_sys_statvfs64 },		/* 218 = svr4_sys_statvfs64 */
-	{ 2, (sy_call_t *)svr4_sys_fstatvfs64 },		/* 219 = svr4_sys_fstatvfs64 */
-	{ 2, (sy_call_t *)svr4_sys_setrlimit64 },		/* 220 = svr4_sys_setrlimit64 */
-	{ 2, (sy_call_t *)svr4_sys_getrlimit64 },		/* 221 = svr4_sys_getrlimit64 */
+	{ AS(svr4_sys_getdents64_args), (sy_call_t *)svr4_sys_getdents64 },	/* 213 = svr4_sys_getdents64 */
+	{ AS(svr4_sys_mmap64_args), (sy_call_t *)svr4_sys_mmap64 },	/* 214 = svr4_sys_mmap64 */
+	{ AS(svr4_sys_stat64_args), (sy_call_t *)svr4_sys_stat64 },	/* 215 = svr4_sys_stat64 */
+	{ AS(svr4_sys_lstat64_args), (sy_call_t *)svr4_sys_lstat64 },	/* 216 = svr4_sys_lstat64 */
+	{ AS(svr4_sys_fstat64_args), (sy_call_t *)svr4_sys_fstat64 },	/* 217 = svr4_sys_fstat64 */
+	{ AS(svr4_sys_statvfs64_args), (sy_call_t *)svr4_sys_statvfs64 },	/* 218 = svr4_sys_statvfs64 */
+	{ AS(svr4_sys_fstatvfs64_args), (sy_call_t *)svr4_sys_fstatvfs64 },	/* 219 = svr4_sys_fstatvfs64 */
+	{ AS(svr4_sys_setrlimit64_args), (sy_call_t *)svr4_sys_setrlimit64 },	/* 220 = svr4_sys_setrlimit64 */
+	{ AS(svr4_sys_getrlimit64_args), (sy_call_t *)svr4_sys_getrlimit64 },	/* 221 = svr4_sys_getrlimit64 */
 	{ 0, (sy_call_t *)nosys },			/* 222 = pread64 */
 	{ 0, (sy_call_t *)nosys },			/* 223 = pwrite64 */
-	{ 2, (sy_call_t *)svr4_sys_creat64 },		/* 224 = svr4_sys_creat64 */
-	{ 3, (sy_call_t *)svr4_sys_open64 },		/* 225 = svr4_sys_open64 */
+	{ AS(svr4_sys_creat64_args), (sy_call_t *)svr4_sys_creat64 },	/* 224 = svr4_sys_creat64 */
+	{ AS(svr4_sys_open64_args), (sy_call_t *)svr4_sys_open64 },	/* 225 = svr4_sys_open64 */
 	{ 0, (sy_call_t *)nosys },			/* 226 = rpcsys */
 	{ 0, (sy_call_t *)nosys },			/* 227 = whoknows */
 	{ 0, (sy_call_t *)nosys },			/* 228 = whoknows */
 	{ 0, (sy_call_t *)nosys },			/* 229 = whoknows */
-	{ 3, (sy_call_t *)svr4_sys_socket },		/* 230 = svr4_sys_socket */
-	{ 4, (sy_call_t *)socketpair },			/* 231 = socketpair */
-	{ 3, (sy_call_t *)bind },			/* 232 = bind */
-	{ 2, (sy_call_t *)listen },			/* 233 = listen */
-	{ 3, (sy_call_t *)accept },			/* 234 = accept */
-	{ 3, (sy_call_t *)connect },			/* 235 = connect */
-	{ 2, (sy_call_t *)shutdown },			/* 236 = shutdown */
-	{ 4, (sy_call_t *)svr4_sys_recv },		/* 237 = svr4_sys_recv */
-	{ 6, (sy_call_t *)recvfrom },			/* 238 = recvfrom */
-	{ 3, (sy_call_t *)recvmsg },			/* 239 = recvmsg */
-	{ 4, (sy_call_t *)svr4_sys_send },		/* 240 = svr4_sys_send */
-	{ 3, (sy_call_t *)sendmsg },			/* 241 = sendmsg */
-	{ 6, (sy_call_t *)svr4_sys_sendto },		/* 242 = svr4_sys_sendto */
-	{ 3, (sy_call_t *)getpeername },		/* 243 = getpeername */
-	{ 3, (sy_call_t *)getsockname },		/* 244 = getsockname */
-	{ 5, (sy_call_t *)getsockopt },			/* 245 = getsockopt */
-	{ 5, (sy_call_t *)setsockopt },			/* 246 = setsockopt */
+	{ AS(svr4_sys_socket_args), (sy_call_t *)svr4_sys_socket },	/* 230 = svr4_sys_socket */
+	{ AS(socketpair_args), (sy_call_t *)socketpair },	/* 231 = socketpair */
+	{ AS(bind_args), (sy_call_t *)bind },		/* 232 = bind */
+	{ AS(listen_args), (sy_call_t *)listen },	/* 233 = listen */
+	{ AS(accept_args), (sy_call_t *)accept },	/* 234 = accept */
+	{ AS(connect_args), (sy_call_t *)connect },	/* 235 = connect */
+	{ AS(shutdown_args), (sy_call_t *)shutdown },	/* 236 = shutdown */
+	{ AS(svr4_sys_recv_args), (sy_call_t *)svr4_sys_recv },	/* 237 = svr4_sys_recv */
+	{ AS(recvfrom_args), (sy_call_t *)recvfrom },	/* 238 = recvfrom */
+	{ AS(recvmsg_args), (sy_call_t *)recvmsg },	/* 239 = recvmsg */
+	{ AS(svr4_sys_send_args), (sy_call_t *)svr4_sys_send },	/* 240 = svr4_sys_send */
+	{ AS(sendmsg_args), (sy_call_t *)sendmsg },	/* 241 = sendmsg */
+	{ AS(svr4_sys_sendto_args), (sy_call_t *)svr4_sys_sendto },	/* 242 = svr4_sys_sendto */
+	{ AS(getpeername_args), (sy_call_t *)getpeername },	/* 243 = getpeername */
+	{ AS(getsockname_args), (sy_call_t *)getsockname },	/* 244 = getsockname */
+	{ AS(getsockopt_args), (sy_call_t *)getsockopt },	/* 245 = getsockopt */
+	{ AS(setsockopt_args), (sy_call_t *)setsockopt },	/* 246 = setsockopt */
 	{ 0, (sy_call_t *)nosys },			/* 247 = sockconfig */
 	{ 0, (sy_call_t *)nosys },			/* 248 = { */
 	{ 0, (sy_call_t *)nosys },			/* 249 = { */