Regen to propogate <prefix>_AUE_<mumble> changes as well as the earlier

systrace changes.

5 files changed, 284 insertions, 212 deletions

diff --git a/sys/i386/ibcs2/ibcs2_isc_sysent.c b/sys/i386/ibcs2/ibcs2_isc_sysent.c
index 645c3dc..ca76a8c 100644
--- a/sys/i386/ibcs2/ibcs2_isc_sysent.c
+++ b/sys/i386/ibcs2/ibcs2_isc_sysent.c
@@ -19,25 +19,25 @@
 
 /* The casts are bogus but will do for now. */
 struct sysent isc_sysent[] = {
-	{ 0, (sy_call_t *)nosys, AUE_NULL },			/* 0 = nosys */
-	{ 0, (sy_call_t *)nosys, AUE_NULL },			/* 1 = isc_setostype */
-	{ AS(ibcs2_rename_args), (sy_call_t *)ibcs2_rename, AUE_RENAME },	/* 2 = ibcs2_rename */
-	{ AS(ibcs2_sigaction_args), (sy_call_t *)ibcs2_sigaction, AUE_NULL },	/* 3 = ibcs2_sigaction */
-	{ AS(ibcs2_sigprocmask_args), (sy_call_t *)ibcs2_sigprocmask, AUE_NULL },	/* 4 = ibcs2_sigprocmask */
-	{ AS(ibcs2_sigpending_args), (sy_call_t *)ibcs2_sigpending, AUE_NULL },	/* 5 = ibcs2_sigpending */
-	{ AS(getgroups_args), (sy_call_t *)getgroups, AUE_GETGROUPS },	/* 6 = getgroups */
-	{ AS(setgroups_args), (sy_call_t *)setgroups, AUE_SETGROUPS },	/* 7 = setgroups */
-	{ AS(ibcs2_pathconf_args), (sy_call_t *)ibcs2_pathconf, AUE_PATHCONF },	/* 8 = ibcs2_pathconf */
-	{ AS(ibcs2_fpathconf_args), (sy_call_t *)ibcs2_fpathconf, AUE_FPATHCONF },	/* 9 = ibcs2_fpathconf */
-	{ 0, (sy_call_t *)nosys, AUE_NULL },			/* 10 = nosys */
-	{ AS(ibcs2_wait_args), (sy_call_t *)ibcs2_wait, AUE_WAIT4 },	/* 11 = ibcs2_wait */
-	{ 0, (sy_call_t *)setsid, AUE_SETSID },		/* 12 = setsid */
-	{ 0, (sy_call_t *)getpid, AUE_GETPID },		/* 13 = getpid */
-	{ 0, (sy_call_t *)nosys, AUE_NULL },			/* 14 = isc_adduser */
-	{ 0, (sy_call_t *)nosys, AUE_NULL },			/* 15 = isc_setuser */
-	{ AS(ibcs2_sysconf_args), (sy_call_t *)ibcs2_sysconf, AUE_NULL },	/* 16 = ibcs2_sysconf */
-	{ AS(ibcs2_sigsuspend_args), (sy_call_t *)ibcs2_sigsuspend, AUE_NULL },	/* 17 = ibcs2_sigsuspend */
-	{ AS(ibcs2_symlink_args), (sy_call_t *)ibcs2_symlink, AUE_SYMLINK },	/* 18 = ibcs2_symlink */
-	{ AS(ibcs2_readlink_args), (sy_call_t *)ibcs2_readlink, AUE_READLINK },	/* 19 = ibcs2_readlink */
-	{ 0, (sy_call_t *)nosys, AUE_NULL },			/* 20 = isc_getmajor */
+	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 },			/* 0 = nosys */
+	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 },			/* 1 = isc_setostype */
+	{ AS(ibcs2_rename_args), (sy_call_t *)ibcs2_rename, AUE_RENAME, NULL, 0, 0 },	/* 2 = ibcs2_rename */
+	{ AS(ibcs2_sigaction_args), (sy_call_t *)ibcs2_sigaction, AUE_NULL, NULL, 0, 0 },	/* 3 = ibcs2_sigaction */
+	{ AS(ibcs2_sigprocmask_args), (sy_call_t *)ibcs2_sigprocmask, AUE_NULL, NULL, 0, 0 },	/* 4 = ibcs2_sigprocmask */
+	{ AS(ibcs2_sigpending_args), (sy_call_t *)ibcs2_sigpending, AUE_NULL, NULL, 0, 0 },	/* 5 = ibcs2_sigpending */
+	{ AS(getgroups_args), (sy_call_t *)getgroups, AUE_GETGROUPS, NULL, 0, 0 },	/* 6 = getgroups */
+	{ AS(setgroups_args), (sy_call_t *)setgroups, AUE_SETGROUPS, NULL, 0, 0 },	/* 7 = setgroups */
+	{ AS(ibcs2_pathconf_args), (sy_call_t *)ibcs2_pathconf, AUE_PATHCONF, NULL, 0, 0 },	/* 8 = ibcs2_pathconf */
+	{ AS(ibcs2_fpathconf_args), (sy_call_t *)ibcs2_fpathconf, AUE_FPATHCONF, NULL, 0, 0 },	/* 9 = ibcs2_fpathconf */
+	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 },			/* 10 = nosys */
+	{ AS(ibcs2_wait_args), (sy_call_t *)ibcs2_wait, AUE_WAIT4, NULL, 0, 0 },	/* 11 = ibcs2_wait */
+	{ 0, (sy_call_t *)setsid, AUE_SETSID, NULL, 0, 0 },		/* 12 = setsid */
+	{ 0, (sy_call_t *)getpid, AUE_GETPID, NULL, 0, 0 },		/* 13 = getpid */
+	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 },			/* 14 = isc_adduser */
+	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 },			/* 15 = isc_setuser */
+	{ AS(ibcs2_sysconf_args), (sy_call_t *)ibcs2_sysconf, AUE_NULL, NULL, 0, 0 },	/* 16 = ibcs2_sysconf */
+	{ AS(ibcs2_sigsuspend_args), (sy_call_t *)ibcs2_sigsuspend, AUE_NULL, NULL, 0, 0 },	/* 17 = ibcs2_sigsuspend */
+	{ AS(ibcs2_symlink_args), (sy_call_t *)ibcs2_symlink, AUE_SYMLINK, NULL, 0, 0 },	/* 18 = ibcs2_symlink */
+	{ AS(ibcs2_readlink_args), (sy_call_t *)ibcs2_readlink, AUE_READLINK, NULL, 0, 0 },	/* 19 = ibcs2_readlink */
+	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 },			/* 20 = isc_getmajor */
 };
diff --git a/sys/i386/ibcs2/ibcs2_proto.h b/sys/i386/ibcs2/ibcs2_proto.h
index 24c51a4..04b86d9 100644
--- a/sys/i386/ibcs2/ibcs2_proto.h
+++ b/sys/i386/ibcs2/ibcs2_proto.h
@@ -11,12 +11,11 @@
 
 #include <sys/signal.h>
 #include <sys/acl.h>
-#include <sys/thr.h>
-#include <sys/umtx.h>
 #include <posix4/_semaphore.h>
-
 #include <sys/ucontext.h>
 
+#include <bsm/audit_kevents.h>
+
 struct proc;
 
 struct thread;
@@ -349,6 +348,62 @@ int	ibcs2_isc(struct thread *, struct ibcs2_isc_args *);
 
 #endif /* COMPAT_FREEBSD4 */
 
+#define	IBCS2_SYS_AUE_ibcs2_read	AUE_NULL
+#define	IBCS2_SYS_AUE_ibcs2_open	AUE_OPEN_RWTC
+#define	IBCS2_SYS_AUE_ibcs2_wait	AUE_WAIT4
+#define	IBCS2_SYS_AUE_ibcs2_creat	AUE_CREAT
+#define	IBCS2_SYS_AUE_ibcs2_unlink	AUE_UNLINK
+#define	IBCS2_SYS_AUE_ibcs2_execv	AUE_EXECVE
+#define	IBCS2_SYS_AUE_ibcs2_chdir	AUE_CHDIR
+#define	IBCS2_SYS_AUE_ibcs2_time	AUE_NULL
+#define	IBCS2_SYS_AUE_ibcs2_mknod	AUE_MKNOD
+#define	IBCS2_SYS_AUE_ibcs2_chmod	AUE_CHMOD
+#define	IBCS2_SYS_AUE_ibcs2_chown	AUE_CHOWN
+#define	IBCS2_SYS_AUE_ibcs2_stat	AUE_STAT
+#define	IBCS2_SYS_AUE_ibcs2_lseek	AUE_LSEEK
+#define	IBCS2_SYS_AUE_ibcs2_mount	AUE_MOUNT
+#define	IBCS2_SYS_AUE_ibcs2_umount	AUE_UMOUNT
+#define	IBCS2_SYS_AUE_ibcs2_setuid	AUE_SETUID
+#define	IBCS2_SYS_AUE_ibcs2_stime	AUE_SETTIMEOFDAY
+#define	IBCS2_SYS_AUE_ibcs2_alarm	AUE_NULL
+#define	IBCS2_SYS_AUE_ibcs2_fstat	AUE_FSTAT
+#define	IBCS2_SYS_AUE_ibcs2_pause	AUE_NULL
+#define	IBCS2_SYS_AUE_ibcs2_utime	AUE_NULL
+#define	IBCS2_SYS_AUE_ibcs2_stty	AUE_NULL
+#define	IBCS2_SYS_AUE_ibcs2_gtty	AUE_NULL
+#define	IBCS2_SYS_AUE_ibcs2_access	AUE_ACCESS
+#define	IBCS2_SYS_AUE_ibcs2_nice	AUE_NICE
+#define	IBCS2_SYS_AUE_ibcs2_statfs	AUE_STATFS
+#define	IBCS2_SYS_AUE_ibcs2_kill	AUE_KILL
+#define	IBCS2_SYS_AUE_ibcs2_fstatfs	AUE_FSTATFS
+#define	IBCS2_SYS_AUE_ibcs2_pgrpsys	AUE_NULL
+#define	IBCS2_SYS_AUE_ibcs2_xenix	AUE_NULL
+#define	IBCS2_SYS_AUE_ibcs2_times	AUE_NULL
+#define	IBCS2_SYS_AUE_ibcs2_plock	AUE_NULL
+#define	IBCS2_SYS_AUE_ibcs2_setgid	AUE_SETGID
+#define	IBCS2_SYS_AUE_ibcs2_sigsys	AUE_NULL
+#define	IBCS2_SYS_AUE_ibcs2_msgsys	AUE_MSGSYS
+#define	IBCS2_SYS_AUE_ibcs2_sysi86	AUE_NULL
+#define	IBCS2_SYS_AUE_ibcs2_shmsys	AUE_SHMSYS
+#define	IBCS2_SYS_AUE_ibcs2_semsys	AUE_SEMSYS
+#define	IBCS2_SYS_AUE_ibcs2_ioctl	AUE_IOCTL
+#define	IBCS2_SYS_AUE_ibcs2_uadmin	AUE_NULL
+#define	IBCS2_SYS_AUE_ibcs2_utssys	AUE_NULL
+#define	IBCS2_SYS_AUE_ibcs2_execve	AUE_EXECVE
+#define	IBCS2_SYS_AUE_ibcs2_fcntl	AUE_FCNTL
+#define	IBCS2_SYS_AUE_ibcs2_ulimit	AUE_NULL
+#define	IBCS2_SYS_AUE_ibcs2_rmdir	AUE_RMDIR
+#define	IBCS2_SYS_AUE_ibcs2_mkdir	AUE_MKDIR
+#define	IBCS2_SYS_AUE_ibcs2_getdents	AUE_GETDIRENTRIES
+#define	IBCS2_SYS_AUE_ibcs2_sysfs	AUE_NULL
+#define	IBCS2_SYS_AUE_ibcs2_getmsg	AUE_GETMSG
+#define	IBCS2_SYS_AUE_ibcs2_putmsg	AUE_PUTMSG
+#define	IBCS2_SYS_AUE_ibcs2_secure	AUE_NULL
+#define	IBCS2_SYS_AUE_ibcs2_symlink	AUE_SYMLINK
+#define	IBCS2_SYS_AUE_ibcs2_lstat	AUE_LSTAT
+#define	IBCS2_SYS_AUE_ibcs2_readlink	AUE_READLINK
+#define	IBCS2_SYS_AUE_ibcs2_isc	AUE_NULL
+
 #undef PAD_
 #undef PADL_
 #undef PADR_
diff --git a/sys/i386/ibcs2/ibcs2_sysent.c b/sys/i386/ibcs2/ibcs2_sysent.c
index e8a7b12..fceaf3f 100644
--- a/sys/i386/ibcs2/ibcs2_sysent.c
+++ b/sys/i386/ibcs2/ibcs2_sysent.c
@@ -18,132 +18,132 @@
 
 /* The casts are bogus but will do for now. */
 struct sysent ibcs2_sysent[] = {
-	{ 0, (sy_call_t *)nosys, AUE_NULL },		/* 0 = syscall */
-	{ AS(sys_exit_args), (sy_call_t *)sys_exit, AUE_EXIT },	/* 1 = exit */
-	{ 0, (sy_call_t *)fork, AUE_FORK },		/* 2 = fork */
-	{ AS(ibcs2_read_args), (sy_call_t *)ibcs2_read, AUE_NULL },	/* 3 = ibcs2_read */
-	{ AS(write_args), (sy_call_t *)write, AUE_NULL },	/* 4 = write */
-	{ AS(ibcs2_open_args), (sy_call_t *)ibcs2_open, AUE_OPEN_RWTC },	/* 5 = ibcs2_open */
-	{ AS(close_args), (sy_call_t *)close, AUE_CLOSE },	/* 6 = close */
-	{ AS(ibcs2_wait_args), (sy_call_t *)ibcs2_wait, AUE_WAIT4 },	/* 7 = ibcs2_wait */
-	{ AS(ibcs2_creat_args), (sy_call_t *)ibcs2_creat, AUE_CREAT },	/* 8 = ibcs2_creat */
-	{ AS(link_args), (sy_call_t *)link, AUE_LINK },	/* 9 = link */
-	{ AS(ibcs2_unlink_args), (sy_call_t *)ibcs2_unlink, AUE_UNLINK },	/* 10 = ibcs2_unlink */
-	{ AS(ibcs2_execv_args), (sy_call_t *)ibcs2_execv, AUE_EXECVE },	/* 11 = ibcs2_execv */
-	{ AS(ibcs2_chdir_args), (sy_call_t *)ibcs2_chdir, AUE_CHDIR },	/* 12 = ibcs2_chdir */
-	{ AS(ibcs2_time_args), (sy_call_t *)ibcs2_time, AUE_NULL },	/* 13 = ibcs2_time */
-	{ AS(ibcs2_mknod_args), (sy_call_t *)ibcs2_mknod, AUE_MKNOD },	/* 14 = ibcs2_mknod */
-	{ AS(ibcs2_chmod_args), (sy_call_t *)ibcs2_chmod, AUE_CHMOD },	/* 15 = ibcs2_chmod */
-	{ AS(ibcs2_chown_args), (sy_call_t *)ibcs2_chown, AUE_CHOWN },	/* 16 = ibcs2_chown */
-	{ AS(obreak_args), (sy_call_t *)obreak, AUE_NULL },	/* 17 = obreak */
-	{ AS(ibcs2_stat_args), (sy_call_t *)ibcs2_stat, AUE_STAT },	/* 18 = ibcs2_stat */
-	{ AS(ibcs2_lseek_args), (sy_call_t *)ibcs2_lseek, AUE_LSEEK },	/* 19 = ibcs2_lseek */
-	{ 0, (sy_call_t *)getpid, AUE_NULL },		/* 20 = getpid */
-	{ AS(ibcs2_mount_args), (sy_call_t *)ibcs2_mount, AUE_MOUNT },	/* 21 = ibcs2_mount */
-	{ AS(ibcs2_umount_args), (sy_call_t *)ibcs2_umount, AUE_UMOUNT },	/* 22 = ibcs2_umount */
-	{ AS(ibcs2_setuid_args), (sy_call_t *)ibcs2_setuid, AUE_SETUID },	/* 23 = ibcs2_setuid */
-	{ 0, (sy_call_t *)getuid, AUE_GETUID },		/* 24 = getuid */
-	{ AS(ibcs2_stime_args), (sy_call_t *)ibcs2_stime, AUE_SETTIMEOFDAY },	/* 25 = ibcs2_stime */
-	{ AS(ptrace_args), (sy_call_t *)ptrace, AUE_PTRACE },	/* 26 = ptrace */
-	{ AS(ibcs2_alarm_args), (sy_call_t *)ibcs2_alarm, AUE_NULL },	/* 27 = ibcs2_alarm */
-	{ AS(ibcs2_fstat_args), (sy_call_t *)ibcs2_fstat, AUE_FSTAT },	/* 28 = ibcs2_fstat */
-	{ 0, (sy_call_t *)ibcs2_pause, AUE_NULL },	/* 29 = ibcs2_pause */
-	{ AS(ibcs2_utime_args), (sy_call_t *)ibcs2_utime, AUE_NULL },	/* 30 = ibcs2_utime */
-	{ AS(ibcs2_stty_args), (sy_call_t *)ibcs2_stty, AUE_NULL },	/* 31 = ibcs2_stty */
-	{ AS(ibcs2_gtty_args), (sy_call_t *)ibcs2_gtty, AUE_NULL },	/* 32 = ibcs2_gtty */
-	{ AS(ibcs2_access_args), (sy_call_t *)ibcs2_access, AUE_ACCESS },	/* 33 = ibcs2_access */
-	{ AS(ibcs2_nice_args), (sy_call_t *)ibcs2_nice, AUE_NICE },	/* 34 = ibcs2_nice */
-	{ AS(ibcs2_statfs_args), (sy_call_t *)ibcs2_statfs, AUE_STATFS },	/* 35 = ibcs2_statfs */
-	{ 0, (sy_call_t *)sync, AUE_NULL },		/* 36 = sync */
-	{ AS(ibcs2_kill_args), (sy_call_t *)ibcs2_kill, AUE_KILL },	/* 37 = ibcs2_kill */
-	{ AS(ibcs2_fstatfs_args), (sy_call_t *)ibcs2_fstatfs, AUE_FSTATFS },	/* 38 = ibcs2_fstatfs */
-	{ AS(ibcs2_pgrpsys_args), (sy_call_t *)ibcs2_pgrpsys, AUE_NULL },	/* 39 = ibcs2_pgrpsys */
-	{ AS(ibcs2_xenix_args), (sy_call_t *)ibcs2_xenix, AUE_NULL },	/* 40 = ibcs2_xenix */
-	{ AS(dup_args), (sy_call_t *)dup, AUE_NULL },	/* 41 = dup */
-	{ 0, (sy_call_t *)pipe, AUE_PIPE },		/* 42 = pipe */
-	{ AS(ibcs2_times_args), (sy_call_t *)ibcs2_times, AUE_NULL },	/* 43 = ibcs2_times */
-	{ AS(profil_args), (sy_call_t *)profil, AUE_PROFILE },	/* 44 = profil */
-	{ AS(ibcs2_plock_args), (sy_call_t *)ibcs2_plock, AUE_NULL },	/* 45 = ibcs2_plock */
-	{ AS(ibcs2_setgid_args), (sy_call_t *)ibcs2_setgid, AUE_SETGID },	/* 46 = ibcs2_setgid */
-	{ 0, (sy_call_t *)getgid, AUE_GETGID },		/* 47 = getgid */
-	{ AS(ibcs2_sigsys_args), (sy_call_t *)ibcs2_sigsys, AUE_NULL },	/* 48 = ibcs2_sigsys */
-	{ AS(ibcs2_msgsys_args), (sy_call_t *)ibcs2_msgsys, AUE_MSGSYS },	/* 49 = ibcs2_msgsys */
-	{ AS(ibcs2_sysi86_args), (sy_call_t *)ibcs2_sysi86, AUE_NULL },	/* 50 = ibcs2_sysi86 */
-	{ 0, (sy_call_t *)nosys, AUE_NULL },			/* 51 = ibcs2_acct */
-	{ AS(ibcs2_shmsys_args), (sy_call_t *)ibcs2_shmsys, AUE_SHMSYS },	/* 52 = ibcs2_shmsys */
-	{ AS(ibcs2_semsys_args), (sy_call_t *)ibcs2_semsys, AUE_SEMSYS },	/* 53 = ibcs2_semsys */
-	{ AS(ibcs2_ioctl_args), (sy_call_t *)ibcs2_ioctl, AUE_IOCTL },	/* 54 = ibcs2_ioctl */
-	{ AS(ibcs2_uadmin_args), (sy_call_t *)ibcs2_uadmin, AUE_NULL },	/* 55 = ibcs2_uadmin */
-	{ 0, (sy_call_t *)nosys, AUE_NULL },			/* 56 = nosys */
-	{ AS(ibcs2_utssys_args), (sy_call_t *)ibcs2_utssys, AUE_NULL },	/* 57 = ibcs2_utssys */
-	{ AS(fsync_args), (sy_call_t *)fsync, AUE_FSYNC },	/* 58 = fsync */
-	{ AS(ibcs2_execve_args), (sy_call_t *)ibcs2_execve, AUE_EXECVE },	/* 59 = ibcs2_execve */
-	{ AS(umask_args), (sy_call_t *)umask, AUE_UMASK },	/* 60 = umask */
-	{ AS(chroot_args), (sy_call_t *)chroot, AUE_CHROOT },	/* 61 = chroot */
-	{ AS(ibcs2_fcntl_args), (sy_call_t *)ibcs2_fcntl, AUE_FCNTL },	/* 62 = ibcs2_fcntl */
-	{ AS(ibcs2_ulimit_args), (sy_call_t *)ibcs2_ulimit, AUE_NULL },	/* 63 = ibcs2_ulimit */
-	{ 0, (sy_call_t *)nosys, AUE_NULL },			/* 64 = reserved for unix/pc */
-	{ 0, (sy_call_t *)nosys, AUE_NULL },			/* 65 = reserved for unix/pc */
-	{ 0, (sy_call_t *)nosys, AUE_NULL },			/* 66 = reserved for unix/pc */
-	{ 0, (sy_call_t *)nosys, AUE_NULL },			/* 67 = reserved for unix/pc */
-	{ 0, (sy_call_t *)nosys, AUE_NULL },			/* 68 = reserved for unix/pc */
-	{ 0, (sy_call_t *)nosys, AUE_NULL },			/* 69 = reserved for unix/pc */
-	{ 0, (sy_call_t *)nosys, AUE_NULL },			/* 70 = obsolete rfs_advfs */
-	{ 0, (sy_call_t *)nosys, AUE_NULL },			/* 71 = obsolete rfs_unadvfs */
-	{ 0, (sy_call_t *)nosys, AUE_NULL },			/* 72 = obsolete rfs_rmount */
-	{ 0, (sy_call_t *)nosys, AUE_NULL },			/* 73 = obsolete rfs_rumount */
-	{ 0, (sy_call_t *)nosys, AUE_NULL },			/* 74 = obsolete rfs_rfstart */
-	{ 0, (sy_call_t *)nosys, AUE_NULL },			/* 75 = obsolete rfs_sigret */
-	{ 0, (sy_call_t *)nosys, AUE_NULL },			/* 76 = obsolete rfs_rdebug */
-	{ 0, (sy_call_t *)nosys, AUE_NULL },			/* 77 = obsolete rfs_rfstop */
-	{ 0, (sy_call_t *)nosys, AUE_NULL },			/* 78 = rfs_rfsys */
-	{ AS(ibcs2_rmdir_args), (sy_call_t *)ibcs2_rmdir, AUE_RMDIR },	/* 79 = ibcs2_rmdir */
-	{ AS(ibcs2_mkdir_args), (sy_call_t *)ibcs2_mkdir, AUE_MKDIR },	/* 80 = ibcs2_mkdir */
-	{ AS(ibcs2_getdents_args), (sy_call_t *)ibcs2_getdents, AUE_GETDIRENTRIES },	/* 81 = ibcs2_getdents */
-	{ 0, (sy_call_t *)nosys, AUE_NULL },			/* 82 = nosys */
-	{ 0, (sy_call_t *)nosys, AUE_NULL },			/* 83 = nosys */
-	{ AS(ibcs2_sysfs_args), (sy_call_t *)ibcs2_sysfs, AUE_NULL },	/* 84 = ibcs2_sysfs */
-	{ AS(ibcs2_getmsg_args), (sy_call_t *)ibcs2_getmsg, AUE_GETMSG },	/* 85 = ibcs2_getmsg */
-	{ AS(ibcs2_putmsg_args), (sy_call_t *)ibcs2_putmsg, AUE_PUTMSG },	/* 86 = ibcs2_putmsg */
-	{ AS(poll_args), (sy_call_t *)poll, AUE_POLL },	/* 87 = poll */
-	{ 0, (sy_call_t *)nosys, AUE_NULL },			/* 88 = nosys */
-	{ AS(ibcs2_secure_args), (sy_call_t *)ibcs2_secure, AUE_NULL },	/* 89 = ibcs2_secure */
-	{ AS(ibcs2_symlink_args), (sy_call_t *)ibcs2_symlink, AUE_SYMLINK },	/* 90 = ibcs2_symlink */
-	{ AS(ibcs2_lstat_args), (sy_call_t *)ibcs2_lstat, AUE_LSTAT },	/* 91 = ibcs2_lstat */
-	{ AS(ibcs2_readlink_args), (sy_call_t *)ibcs2_readlink, AUE_READLINK },	/* 92 = ibcs2_readlink */
-	{ 0, (sy_call_t *)nosys, AUE_NULL },			/* 93 = nosys */
-	{ 0, (sy_call_t *)nosys, AUE_NULL },			/* 94 = nosys */
-	{ 0, (sy_call_t *)nosys, AUE_NULL },			/* 95 = nosys */
-	{ 0, (sy_call_t *)nosys, AUE_NULL },			/* 96 = nosys */
-	{ 0, (sy_call_t *)nosys, AUE_NULL },			/* 97 = nosys */
-	{ 0, (sy_call_t *)nosys, AUE_NULL },			/* 98 = nosys */
-	{ 0, (sy_call_t *)nosys, AUE_NULL },			/* 99 = nosys */
-	{ 0, (sy_call_t *)nosys, AUE_NULL },			/* 100 = nosys */
-	{ 0, (sy_call_t *)nosys, AUE_NULL },			/* 101 = nosys */
-	{ 0, (sy_call_t *)nosys, AUE_NULL },			/* 102 = nosys */
-	{ AS(sigreturn_args), (sy_call_t *)sigreturn, AUE_NULL },	/* 103 = sigreturn */
-	{ 0, (sy_call_t *)nosys, AUE_NULL },			/* 104 = nosys */
-	{ 0, (sy_call_t *)ibcs2_isc, AUE_NULL },		/* 105 = ibcs2_isc */
-	{ 0, (sy_call_t *)nosys, AUE_NULL },			/* 106 = nosys */
-	{ 0, (sy_call_t *)nosys, AUE_NULL },			/* 107 = nosys */
-	{ 0, (sy_call_t *)nosys, AUE_NULL },			/* 108 = nosys */
-	{ 0, (sy_call_t *)nosys, AUE_NULL },			/* 109 = nosys */
-	{ 0, (sy_call_t *)nosys, AUE_NULL },			/* 110 = nosys */
-	{ 0, (sy_call_t *)nosys, AUE_NULL },			/* 111 = nosys */
-	{ 0, (sy_call_t *)nosys, AUE_NULL },			/* 112 = nosys */
-	{ 0, (sy_call_t *)nosys, AUE_NULL },			/* 113 = nosys */
-	{ 0, (sy_call_t *)nosys, AUE_NULL },			/* 114 = nosys */
-	{ 0, (sy_call_t *)nosys, AUE_NULL },			/* 115 = nosys */
-	{ 0, (sy_call_t *)nosys, AUE_NULL },			/* 116 = nosys */
-	{ 0, (sy_call_t *)nosys, AUE_NULL },			/* 117 = nosys */
-	{ 0, (sy_call_t *)nosys, AUE_NULL },			/* 118 = nosys */
-	{ 0, (sy_call_t *)nosys, AUE_NULL },			/* 119 = nosys */
-	{ 0, (sy_call_t *)nosys, AUE_NULL },			/* 120 = nosys */
-	{ 0, (sy_call_t *)nosys, AUE_NULL },			/* 121 = nosys */
-	{ 0, (sy_call_t *)nosys, AUE_NULL },			/* 122 = nosys */
-	{ 0, (sy_call_t *)nosys, AUE_NULL },			/* 123 = nosys */
-	{ 0, (sy_call_t *)nosys, AUE_NULL },			/* 124 = nosys */
-	{ 0, (sy_call_t *)nosys, AUE_NULL },			/* 125 = nosys */
-	{ 0, (sy_call_t *)nosys, AUE_NULL },			/* 126 = nosys */
-	{ 0, (sy_call_t *)nosys, AUE_NULL },			/* 127 = nosys */
+	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 },		/* 0 = syscall */
+	{ AS(sys_exit_args), (sy_call_t *)sys_exit, AUE_EXIT, NULL, 0, 0 },	/* 1 = exit */
+	{ 0, (sy_call_t *)fork, AUE_FORK, NULL, 0, 0 },		/* 2 = fork */
+	{ AS(ibcs2_read_args), (sy_call_t *)ibcs2_read, AUE_NULL, NULL, 0, 0 },	/* 3 = ibcs2_read */
+	{ AS(write_args), (sy_call_t *)write, AUE_NULL, NULL, 0, 0 },	/* 4 = write */
+	{ AS(ibcs2_open_args), (sy_call_t *)ibcs2_open, AUE_OPEN_RWTC, NULL, 0, 0 },	/* 5 = ibcs2_open */
+	{ AS(close_args), (sy_call_t *)close, AUE_CLOSE, NULL, 0, 0 },	/* 6 = close */
+	{ AS(ibcs2_wait_args), (sy_call_t *)ibcs2_wait, AUE_WAIT4, NULL, 0, 0 },	/* 7 = ibcs2_wait */
+	{ AS(ibcs2_creat_args), (sy_call_t *)ibcs2_creat, AUE_CREAT, NULL, 0, 0 },	/* 8 = ibcs2_creat */
+	{ AS(link_args), (sy_call_t *)link, AUE_LINK, NULL, 0, 0 },	/* 9 = link */
+	{ AS(ibcs2_unlink_args), (sy_call_t *)ibcs2_unlink, AUE_UNLINK, NULL, 0, 0 },	/* 10 = ibcs2_unlink */
+	{ AS(ibcs2_execv_args), (sy_call_t *)ibcs2_execv, AUE_EXECVE, NULL, 0, 0 },	/* 11 = ibcs2_execv */
+	{ AS(ibcs2_chdir_args), (sy_call_t *)ibcs2_chdir, AUE_CHDIR, NULL, 0, 0 },	/* 12 = ibcs2_chdir */
+	{ AS(ibcs2_time_args), (sy_call_t *)ibcs2_time, AUE_NULL, NULL, 0, 0 },	/* 13 = ibcs2_time */
+	{ AS(ibcs2_mknod_args), (sy_call_t *)ibcs2_mknod, AUE_MKNOD, NULL, 0, 0 },	/* 14 = ibcs2_mknod */
+	{ AS(ibcs2_chmod_args), (sy_call_t *)ibcs2_chmod, AUE_CHMOD, NULL, 0, 0 },	/* 15 = ibcs2_chmod */
+	{ AS(ibcs2_chown_args), (sy_call_t *)ibcs2_chown, AUE_CHOWN, NULL, 0, 0 },	/* 16 = ibcs2_chown */
+	{ AS(obreak_args), (sy_call_t *)obreak, AUE_NULL, NULL, 0, 0 },	/* 17 = obreak */
+	{ AS(ibcs2_stat_args), (sy_call_t *)ibcs2_stat, AUE_STAT, NULL, 0, 0 },	/* 18 = ibcs2_stat */
+	{ AS(ibcs2_lseek_args), (sy_call_t *)ibcs2_lseek, AUE_LSEEK, NULL, 0, 0 },	/* 19 = ibcs2_lseek */
+	{ 0, (sy_call_t *)getpid, AUE_NULL, NULL, 0, 0 },		/* 20 = getpid */
+	{ AS(ibcs2_mount_args), (sy_call_t *)ibcs2_mount, AUE_MOUNT, NULL, 0, 0 },	/* 21 = ibcs2_mount */
+	{ AS(ibcs2_umount_args), (sy_call_t *)ibcs2_umount, AUE_UMOUNT, NULL, 0, 0 },	/* 22 = ibcs2_umount */
+	{ AS(ibcs2_setuid_args), (sy_call_t *)ibcs2_setuid, AUE_SETUID, NULL, 0, 0 },	/* 23 = ibcs2_setuid */
+	{ 0, (sy_call_t *)getuid, AUE_GETUID, NULL, 0, 0 },		/* 24 = getuid */
+	{ AS(ibcs2_stime_args), (sy_call_t *)ibcs2_stime, AUE_SETTIMEOFDAY, NULL, 0, 0 },	/* 25 = ibcs2_stime */
+	{ AS(ptrace_args), (sy_call_t *)ptrace, AUE_PTRACE, NULL, 0, 0 },	/* 26 = ptrace */
+	{ AS(ibcs2_alarm_args), (sy_call_t *)ibcs2_alarm, AUE_NULL, NULL, 0, 0 },	/* 27 = ibcs2_alarm */
+	{ AS(ibcs2_fstat_args), (sy_call_t *)ibcs2_fstat, AUE_FSTAT, NULL, 0, 0 },	/* 28 = ibcs2_fstat */
+	{ 0, (sy_call_t *)ibcs2_pause, AUE_NULL, NULL, 0, 0 },	/* 29 = ibcs2_pause */
+	{ AS(ibcs2_utime_args), (sy_call_t *)ibcs2_utime, AUE_NULL, NULL, 0, 0 },	/* 30 = ibcs2_utime */
+	{ AS(ibcs2_stty_args), (sy_call_t *)ibcs2_stty, AUE_NULL, NULL, 0, 0 },	/* 31 = ibcs2_stty */
+	{ AS(ibcs2_gtty_args), (sy_call_t *)ibcs2_gtty, AUE_NULL, NULL, 0, 0 },	/* 32 = ibcs2_gtty */
+	{ AS(ibcs2_access_args), (sy_call_t *)ibcs2_access, AUE_ACCESS, NULL, 0, 0 },	/* 33 = ibcs2_access */
+	{ AS(ibcs2_nice_args), (sy_call_t *)ibcs2_nice, AUE_NICE, NULL, 0, 0 },	/* 34 = ibcs2_nice */
+	{ AS(ibcs2_statfs_args), (sy_call_t *)ibcs2_statfs, AUE_STATFS, NULL, 0, 0 },	/* 35 = ibcs2_statfs */
+	{ 0, (sy_call_t *)sync, AUE_NULL, NULL, 0, 0 },		/* 36 = sync */
+	{ AS(ibcs2_kill_args), (sy_call_t *)ibcs2_kill, AUE_KILL, NULL, 0, 0 },	/* 37 = ibcs2_kill */
+	{ AS(ibcs2_fstatfs_args), (sy_call_t *)ibcs2_fstatfs, AUE_FSTATFS, NULL, 0, 0 },	/* 38 = ibcs2_fstatfs */
+	{ AS(ibcs2_pgrpsys_args), (sy_call_t *)ibcs2_pgrpsys, AUE_NULL, NULL, 0, 0 },	/* 39 = ibcs2_pgrpsys */
+	{ AS(ibcs2_xenix_args), (sy_call_t *)ibcs2_xenix, AUE_NULL, NULL, 0, 0 },	/* 40 = ibcs2_xenix */
+	{ AS(dup_args), (sy_call_t *)dup, AUE_NULL, NULL, 0, 0 },	/* 41 = dup */
+	{ 0, (sy_call_t *)pipe, AUE_PIPE, NULL, 0, 0 },		/* 42 = pipe */
+	{ AS(ibcs2_times_args), (sy_call_t *)ibcs2_times, AUE_NULL, NULL, 0, 0 },	/* 43 = ibcs2_times */
+	{ AS(profil_args), (sy_call_t *)profil, AUE_PROFILE, NULL, 0, 0 },	/* 44 = profil */
+	{ AS(ibcs2_plock_args), (sy_call_t *)ibcs2_plock, AUE_NULL, NULL, 0, 0 },	/* 45 = ibcs2_plock */
+	{ AS(ibcs2_setgid_args), (sy_call_t *)ibcs2_setgid, AUE_SETGID, NULL, 0, 0 },	/* 46 = ibcs2_setgid */
+	{ 0, (sy_call_t *)getgid, AUE_GETGID, NULL, 0, 0 },		/* 47 = getgid */
+	{ AS(ibcs2_sigsys_args), (sy_call_t *)ibcs2_sigsys, AUE_NULL, NULL, 0, 0 },	/* 48 = ibcs2_sigsys */
+	{ AS(ibcs2_msgsys_args), (sy_call_t *)ibcs2_msgsys, AUE_MSGSYS, NULL, 0, 0 },	/* 49 = ibcs2_msgsys */
+	{ AS(ibcs2_sysi86_args), (sy_call_t *)ibcs2_sysi86, AUE_NULL, NULL, 0, 0 },	/* 50 = ibcs2_sysi86 */
+	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 },			/* 51 = ibcs2_acct */
+	{ AS(ibcs2_shmsys_args), (sy_call_t *)ibcs2_shmsys, AUE_SHMSYS, NULL, 0, 0 },	/* 52 = ibcs2_shmsys */
+	{ AS(ibcs2_semsys_args), (sy_call_t *)ibcs2_semsys, AUE_SEMSYS, NULL, 0, 0 },	/* 53 = ibcs2_semsys */
+	{ AS(ibcs2_ioctl_args), (sy_call_t *)ibcs2_ioctl, AUE_IOCTL, NULL, 0, 0 },	/* 54 = ibcs2_ioctl */
+	{ AS(ibcs2_uadmin_args), (sy_call_t *)ibcs2_uadmin, AUE_NULL, NULL, 0, 0 },	/* 55 = ibcs2_uadmin */
+	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 },			/* 56 = nosys */
+	{ AS(ibcs2_utssys_args), (sy_call_t *)ibcs2_utssys, AUE_NULL, NULL, 0, 0 },	/* 57 = ibcs2_utssys */
+	{ AS(fsync_args), (sy_call_t *)fsync, AUE_FSYNC, NULL, 0, 0 },	/* 58 = fsync */
+	{ AS(ibcs2_execve_args), (sy_call_t *)ibcs2_execve, AUE_EXECVE, NULL, 0, 0 },	/* 59 = ibcs2_execve */
+	{ AS(umask_args), (sy_call_t *)umask, AUE_UMASK, NULL, 0, 0 },	/* 60 = umask */
+	{ AS(chroot_args), (sy_call_t *)chroot, AUE_CHROOT, NULL, 0, 0 },	/* 61 = chroot */
+	{ AS(ibcs2_fcntl_args), (sy_call_t *)ibcs2_fcntl, AUE_FCNTL, NULL, 0, 0 },	/* 62 = ibcs2_fcntl */
+	{ AS(ibcs2_ulimit_args), (sy_call_t *)ibcs2_ulimit, AUE_NULL, NULL, 0, 0 },	/* 63 = ibcs2_ulimit */
+	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 },			/* 64 = reserved for unix/pc */
+	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 },			/* 65 = reserved for unix/pc */
+	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 },			/* 66 = reserved for unix/pc */
+	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 },			/* 67 = reserved for unix/pc */
+	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 },			/* 68 = reserved for unix/pc */
+	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 },			/* 69 = reserved for unix/pc */
+	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 },			/* 70 = obsolete rfs_advfs */
+	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 },			/* 71 = obsolete rfs_unadvfs */
+	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 },			/* 72 = obsolete rfs_rmount */
+	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 },			/* 73 = obsolete rfs_rumount */
+	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 },			/* 74 = obsolete rfs_rfstart */
+	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 },			/* 75 = obsolete rfs_sigret */
+	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 },			/* 76 = obsolete rfs_rdebug */
+	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 },			/* 77 = obsolete rfs_rfstop */
+	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 },			/* 78 = rfs_rfsys */
+	{ AS(ibcs2_rmdir_args), (sy_call_t *)ibcs2_rmdir, AUE_RMDIR, NULL, 0, 0 },	/* 79 = ibcs2_rmdir */
+	{ AS(ibcs2_mkdir_args), (sy_call_t *)ibcs2_mkdir, AUE_MKDIR, NULL, 0, 0 },	/* 80 = ibcs2_mkdir */
+	{ AS(ibcs2_getdents_args), (sy_call_t *)ibcs2_getdents, AUE_GETDIRENTRIES, NULL, 0, 0 },	/* 81 = ibcs2_getdents */
+	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 },			/* 82 = nosys */
+	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 },			/* 83 = nosys */
+	{ AS(ibcs2_sysfs_args), (sy_call_t *)ibcs2_sysfs, AUE_NULL, NULL, 0, 0 },	/* 84 = ibcs2_sysfs */
+	{ AS(ibcs2_getmsg_args), (sy_call_t *)ibcs2_getmsg, AUE_GETMSG, NULL, 0, 0 },	/* 85 = ibcs2_getmsg */
+	{ AS(ibcs2_putmsg_args), (sy_call_t *)ibcs2_putmsg, AUE_PUTMSG, NULL, 0, 0 },	/* 86 = ibcs2_putmsg */
+	{ AS(poll_args), (sy_call_t *)poll, AUE_POLL, NULL, 0, 0 },	/* 87 = poll */
+	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 },			/* 88 = nosys */
+	{ AS(ibcs2_secure_args), (sy_call_t *)ibcs2_secure, AUE_NULL, NULL, 0, 0 },	/* 89 = ibcs2_secure */
+	{ AS(ibcs2_symlink_args), (sy_call_t *)ibcs2_symlink, AUE_SYMLINK, NULL, 0, 0 },	/* 90 = ibcs2_symlink */
+	{ AS(ibcs2_lstat_args), (sy_call_t *)ibcs2_lstat, AUE_LSTAT, NULL, 0, 0 },	/* 91 = ibcs2_lstat */
+	{ AS(ibcs2_readlink_args), (sy_call_t *)ibcs2_readlink, AUE_READLINK, NULL, 0, 0 },	/* 92 = ibcs2_readlink */
+	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 },			/* 93 = nosys */
+	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 },			/* 94 = nosys */
+	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 },			/* 95 = nosys */
+	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 },			/* 96 = nosys */
+	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 },			/* 97 = nosys */
+	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 },			/* 98 = nosys */
+	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 },			/* 99 = nosys */
+	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 },			/* 100 = nosys */
+	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 },			/* 101 = nosys */
+	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 },			/* 102 = nosys */
+	{ AS(sigreturn_args), (sy_call_t *)sigreturn, AUE_NULL, NULL, 0, 0 },	/* 103 = sigreturn */
+	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 },			/* 104 = nosys */
+	{ 0, (sy_call_t *)ibcs2_isc, AUE_NULL, NULL, 0, 0 },		/* 105 = ibcs2_isc */
+	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 },			/* 106 = nosys */
+	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 },			/* 107 = nosys */
+	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 },			/* 108 = nosys */
+	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 },			/* 109 = nosys */
+	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 },			/* 110 = nosys */
+	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 },			/* 111 = nosys */
+	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 },			/* 112 = nosys */
+	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 },			/* 113 = nosys */
+	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 },			/* 114 = nosys */
+	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 },			/* 115 = nosys */
+	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 },			/* 116 = nosys */
+	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 },			/* 117 = nosys */
+	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 },			/* 118 = nosys */
+	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 },			/* 119 = nosys */
+	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 },			/* 120 = nosys */
+	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 },			/* 121 = nosys */
+	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 },			/* 122 = nosys */
+	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 },			/* 123 = nosys */
+	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 },			/* 124 = nosys */
+	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 },			/* 125 = nosys */
+	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 },			/* 126 = nosys */
+	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 },			/* 127 = nosys */
 };
diff --git a/sys/i386/ibcs2/ibcs2_xenix.h b/sys/i386/ibcs2/ibcs2_xenix.h
index 602366a..5a3164f 100644
--- a/sys/i386/ibcs2/ibcs2_xenix.h
+++ b/sys/i386/ibcs2/ibcs2_xenix.h
@@ -11,12 +11,11 @@
 
 #include <sys/signal.h>
 #include <sys/acl.h>
-#include <sys/thr.h>
-#include <sys/umtx.h>
 #include <posix4/_semaphore.h>
-
 #include <sys/ucontext.h>
 
+#include <bsm/audit_kevents.h>
+
 struct proc;
 
 struct thread;
@@ -123,6 +122,24 @@ int	xenix_utsname(struct thread *, struct xenix_utsname_args *);
 
 #endif /* COMPAT_FREEBSD4 */
 
+#define	IBCS2_XENIX_AUE_xenix_rdchk	AUE_NULL
+#define	IBCS2_XENIX_AUE_xenix_chsize	AUE_FTRUNCATE
+#define	IBCS2_XENIX_AUE_xenix_ftime	AUE_NULL
+#define	IBCS2_XENIX_AUE_xenix_nap	AUE_NULL
+#define	IBCS2_XENIX_AUE_xenix_scoinfo	AUE_NULL
+#define	IBCS2_XENIX_AUE_xenix_eaccess	AUE_EACCESS
+#define	IBCS2_XENIX_AUE_ibcs2_sigaction	AUE_NULL
+#define	IBCS2_XENIX_AUE_ibcs2_sigprocmask	AUE_NULL
+#define	IBCS2_XENIX_AUE_ibcs2_sigpending	AUE_NULL
+#define	IBCS2_XENIX_AUE_ibcs2_sigsuspend	AUE_NULL
+#define	IBCS2_XENIX_AUE_ibcs2_getgroups	AUE_GETGROUPS
+#define	IBCS2_XENIX_AUE_ibcs2_setgroups	AUE_SETGROUPS
+#define	IBCS2_XENIX_AUE_ibcs2_sysconf	AUE_NULL
+#define	IBCS2_XENIX_AUE_ibcs2_pathconf	AUE_PATHCONF
+#define	IBCS2_XENIX_AUE_ibcs2_fpathconf	AUE_FPATHCONF
+#define	IBCS2_XENIX_AUE_ibcs2_rename	AUE_RENAME
+#define	IBCS2_XENIX_AUE_xenix_utsname	AUE_NULL
+
 #undef PAD_
 #undef PADL_
 #undef PADR_
diff --git a/sys/i386/ibcs2/ibcs2_xenix_sysent.c b/sys/i386/ibcs2/ibcs2_xenix_sysent.c
index 7a324df..86b4ea7 100644
--- a/sys/i386/ibcs2/ibcs2_xenix_sysent.c
+++ b/sys/i386/ibcs2/ibcs2_xenix_sysent.c
@@ -18,61 +18,61 @@
 
 /* The casts are bogus but will do for now. */
 struct sysent xenix_sysent[] = {
-	{ 0, (sy_call_t *)nosys, AUE_NULL },			/* 0 = nosys */
-	{ 0, (sy_call_t *)nosys, AUE_NULL },			/* 1 = xenix_xlocking */
-	{ 0, (sy_call_t *)nosys, AUE_NULL },			/* 2 = xenix_creatsem */
-	{ 0, (sy_call_t *)nosys, AUE_NULL },			/* 3 = xenix_opensem */
-	{ 0, (sy_call_t *)nosys, AUE_NULL },			/* 4 = xenix_sigsem */
-	{ 0, (sy_call_t *)nosys, AUE_NULL },			/* 5 = xenix_waitsem */
-	{ 0, (sy_call_t *)nosys, AUE_NULL },			/* 6 = xenix_nbwaitsem */
-	{ AS(xenix_rdchk_args), (sy_call_t *)xenix_rdchk, AUE_NULL },	/* 7 = xenix_rdchk */
-	{ 0, (sy_call_t *)nosys, AUE_NULL },			/* 8 = nosys */
-	{ 0, (sy_call_t *)nosys, AUE_NULL },			/* 9 = nosys */
-	{ AS(xenix_chsize_args), (sy_call_t *)xenix_chsize, AUE_FTRUNCATE },	/* 10 = xenix_chsize */
-	{ AS(xenix_ftime_args), (sy_call_t *)xenix_ftime, AUE_NULL },	/* 11 = xenix_ftime */
-	{ AS(xenix_nap_args), (sy_call_t *)xenix_nap, AUE_NULL },	/* 12 = xenix_nap */
-	{ 0, (sy_call_t *)nosys, AUE_NULL },			/* 13 = xenix_sdget */
-	{ 0, (sy_call_t *)nosys, AUE_NULL },			/* 14 = xenix_sdfree */
-	{ 0, (sy_call_t *)nosys, AUE_NULL },			/* 15 = xenix_sdenter */
-	{ 0, (sy_call_t *)nosys, AUE_NULL },			/* 16 = xenix_sdleave */
-	{ 0, (sy_call_t *)nosys, AUE_NULL },			/* 17 = xenix_sdgetv */
-	{ 0, (sy_call_t *)nosys, AUE_NULL },			/* 18 = xenix_sdwaitv */
-	{ 0, (sy_call_t *)nosys, AUE_NULL },			/* 19 = nosys */
-	{ 0, (sy_call_t *)nosys, AUE_NULL },			/* 20 = nosys */
-	{ 0, (sy_call_t *)xenix_scoinfo, AUE_NULL },	/* 21 = xenix_scoinfo */
-	{ 0, (sy_call_t *)nosys, AUE_NULL },			/* 22 = nosys */
-	{ 0, (sy_call_t *)nosys, AUE_NULL },			/* 23 = nosys */
-	{ 0, (sy_call_t *)nosys, AUE_NULL },			/* 24 = nosys */
-	{ 0, (sy_call_t *)nosys, AUE_NULL },			/* 25 = nosys */
-	{ 0, (sy_call_t *)nosys, AUE_NULL },			/* 26 = nosys */
-	{ 0, (sy_call_t *)nosys, AUE_NULL },			/* 27 = nosys */
-	{ 0, (sy_call_t *)nosys, AUE_NULL },			/* 28 = nosys */
-	{ 0, (sy_call_t *)nosys, AUE_NULL },			/* 29 = nosys */
-	{ 0, (sy_call_t *)nosys, AUE_NULL },			/* 30 = nosys */
-	{ 0, (sy_call_t *)nosys, AUE_NULL },			/* 31 = nosys */
-	{ 0, (sy_call_t *)nosys, AUE_NULL },			/* 32 = xenix_proctl */
-	{ 0, (sy_call_t *)nosys, AUE_NULL },			/* 33 = xenix_execseg */
-	{ 0, (sy_call_t *)nosys, AUE_NULL },			/* 34 = xenix_unexecseg */
-	{ 0, (sy_call_t *)nosys, AUE_NULL },			/* 35 = nosys */
-	{ AS(select_args), (sy_call_t *)select, AUE_SELECT },	/* 36 = select */
-	{ AS(xenix_eaccess_args), (sy_call_t *)xenix_eaccess, AUE_EACCESS },	/* 37 = xenix_eaccess */
-	{ 0, (sy_call_t *)nosys, AUE_NULL },			/* 38 = xenix_paccess */
-	{ AS(ibcs2_sigaction_args), (sy_call_t *)ibcs2_sigaction, AUE_NULL },	/* 39 = ibcs2_sigaction */
-	{ AS(ibcs2_sigprocmask_args), (sy_call_t *)ibcs2_sigprocmask, AUE_NULL },	/* 40 = ibcs2_sigprocmask */
-	{ AS(ibcs2_sigpending_args), (sy_call_t *)ibcs2_sigpending, AUE_NULL },	/* 41 = ibcs2_sigpending */
-	{ AS(ibcs2_sigsuspend_args), (sy_call_t *)ibcs2_sigsuspend, AUE_NULL },	/* 42 = ibcs2_sigsuspend */
-	{ AS(ibcs2_getgroups_args), (sy_call_t *)ibcs2_getgroups, AUE_GETGROUPS },	/* 43 = ibcs2_getgroups */
-	{ AS(ibcs2_setgroups_args), (sy_call_t *)ibcs2_setgroups, AUE_SETGROUPS },	/* 44 = ibcs2_setgroups */
-	{ AS(ibcs2_sysconf_args), (sy_call_t *)ibcs2_sysconf, AUE_NULL },	/* 45 = ibcs2_sysconf */
-	{ AS(ibcs2_pathconf_args), (sy_call_t *)ibcs2_pathconf, AUE_PATHCONF },	/* 46 = ibcs2_pathconf */
-	{ AS(ibcs2_fpathconf_args), (sy_call_t *)ibcs2_fpathconf, AUE_FPATHCONF },	/* 47 = ibcs2_fpathconf */
-	{ AS(ibcs2_rename_args), (sy_call_t *)ibcs2_rename, AUE_RENAME },	/* 48 = ibcs2_rename */
-	{ 0, (sy_call_t *)nosys, AUE_NULL },			/* 49 = nosys */
-	{ AS(xenix_utsname_args), (sy_call_t *)xenix_utsname, AUE_NULL },	/* 50 = xenix_utsname */
-	{ 0, (sy_call_t *)nosys, AUE_NULL },			/* 51 = nosys */
-	{ 0, (sy_call_t *)nosys, AUE_NULL },			/* 52 = nosys */
-	{ 0, (sy_call_t *)nosys, AUE_NULL },			/* 53 = nosys */
-	{ 0, (sy_call_t *)nosys, AUE_NULL },			/* 54 = nosys */
-	{ AS(getitimer_args), (sy_call_t *)getitimer, AUE_GETITIMER },	/* 55 = getitimer */
-	{ AS(setitimer_args), (sy_call_t *)setitimer, AUE_SETITIMER },	/* 56 = setitimer */
+	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 },			/* 0 = nosys */
+	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 },			/* 1 = xenix_xlocking */
+	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 },			/* 2 = xenix_creatsem */
+	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 },			/* 3 = xenix_opensem */
+	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 },			/* 4 = xenix_sigsem */
+	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 },			/* 5 = xenix_waitsem */
+	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 },			/* 6 = xenix_nbwaitsem */
+	{ AS(xenix_rdchk_args), (sy_call_t *)xenix_rdchk, AUE_NULL, NULL, 0, 0 },	/* 7 = xenix_rdchk */
+	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 },			/* 8 = nosys */
+	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 },			/* 9 = nosys */
+	{ AS(xenix_chsize_args), (sy_call_t *)xenix_chsize, AUE_FTRUNCATE, NULL, 0, 0 },	/* 10 = xenix_chsize */
+	{ AS(xenix_ftime_args), (sy_call_t *)xenix_ftime, AUE_NULL, NULL, 0, 0 },	/* 11 = xenix_ftime */
+	{ AS(xenix_nap_args), (sy_call_t *)xenix_nap, AUE_NULL, NULL, 0, 0 },	/* 12 = xenix_nap */
+	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 },			/* 13 = xenix_sdget */
+	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 },			/* 14 = xenix_sdfree */
+	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 },			/* 15 = xenix_sdenter */
+	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 },			/* 16 = xenix_sdleave */
+	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 },			/* 17 = xenix_sdgetv */
+	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 },			/* 18 = xenix_sdwaitv */
+	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 },			/* 19 = nosys */
+	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 },			/* 20 = nosys */
+	{ 0, (sy_call_t *)xenix_scoinfo, AUE_NULL, NULL, 0, 0 },	/* 21 = xenix_scoinfo */
+	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 },			/* 22 = nosys */
+	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 },			/* 23 = nosys */
+	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 },			/* 24 = nosys */
+	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 },			/* 25 = nosys */
+	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 },			/* 26 = nosys */
+	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 },			/* 27 = nosys */
+	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 },			/* 28 = nosys */
+	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 },			/* 29 = nosys */
+	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 },			/* 30 = nosys */
+	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 },			/* 31 = nosys */
+	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 },			/* 32 = xenix_proctl */
+	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 },			/* 33 = xenix_execseg */
+	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 },			/* 34 = xenix_unexecseg */
+	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 },			/* 35 = nosys */
+	{ AS(select_args), (sy_call_t *)select, AUE_SELECT, NULL, 0, 0 },	/* 36 = select */
+	{ AS(xenix_eaccess_args), (sy_call_t *)xenix_eaccess, AUE_EACCESS, NULL, 0, 0 },	/* 37 = xenix_eaccess */
+	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 },			/* 38 = xenix_paccess */
+	{ AS(ibcs2_sigaction_args), (sy_call_t *)ibcs2_sigaction, AUE_NULL, NULL, 0, 0 },	/* 39 = ibcs2_sigaction */
+	{ AS(ibcs2_sigprocmask_args), (sy_call_t *)ibcs2_sigprocmask, AUE_NULL, NULL, 0, 0 },	/* 40 = ibcs2_sigprocmask */
+	{ AS(ibcs2_sigpending_args), (sy_call_t *)ibcs2_sigpending, AUE_NULL, NULL, 0, 0 },	/* 41 = ibcs2_sigpending */
+	{ AS(ibcs2_sigsuspend_args), (sy_call_t *)ibcs2_sigsuspend, AUE_NULL, NULL, 0, 0 },	/* 42 = ibcs2_sigsuspend */
+	{ AS(ibcs2_getgroups_args), (sy_call_t *)ibcs2_getgroups, AUE_GETGROUPS, NULL, 0, 0 },	/* 43 = ibcs2_getgroups */
+	{ AS(ibcs2_setgroups_args), (sy_call_t *)ibcs2_setgroups, AUE_SETGROUPS, NULL, 0, 0 },	/* 44 = ibcs2_setgroups */
+	{ AS(ibcs2_sysconf_args), (sy_call_t *)ibcs2_sysconf, AUE_NULL, NULL, 0, 0 },	/* 45 = ibcs2_sysconf */
+	{ AS(ibcs2_pathconf_args), (sy_call_t *)ibcs2_pathconf, AUE_PATHCONF, NULL, 0, 0 },	/* 46 = ibcs2_pathconf */
+	{ AS(ibcs2_fpathconf_args), (sy_call_t *)ibcs2_fpathconf, AUE_FPATHCONF, NULL, 0, 0 },	/* 47 = ibcs2_fpathconf */
+	{ AS(ibcs2_rename_args), (sy_call_t *)ibcs2_rename, AUE_RENAME, NULL, 0, 0 },	/* 48 = ibcs2_rename */
+	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 },			/* 49 = nosys */
+	{ AS(xenix_utsname_args), (sy_call_t *)xenix_utsname, AUE_NULL, NULL, 0, 0 },	/* 50 = xenix_utsname */
+	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 },			/* 51 = nosys */
+	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 },			/* 52 = nosys */
+	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 },			/* 53 = nosys */
+	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 },			/* 54 = nosys */
+	{ AS(getitimer_args), (sy_call_t *)getitimer, AUE_GETITIMER, NULL, 0, 0 },	/* 55 = getitimer */
+	{ AS(setitimer_args), (sy_call_t *)setitimer, AUE_SETITIMER, NULL, 0, 0 },	/* 56 = setitimer */
 };