Author: rwatson
Date: Wed Mar 29 22:33:56 2017
New Revision: 316182
URL: https://svnweb.freebsd.org/changeset/base/316182

Log:
  Hook up new audit event identifiers for various non-Orange Book/CAPP
  system calls supported by OpenBSM 1.2-alpha5.
  
  Obtained from:        TrustedBSD Project
  MFC after:    3 weeks
  Sponsored by: DARPA, AFRL

Modified:
  head/sys/compat/freebsd32/freebsd32_proto.h
  head/sys/compat/freebsd32/freebsd32_sysent.c
  head/sys/compat/freebsd32/syscalls.master
  head/sys/kern/init_sysent.c
  head/sys/kern/syscalls.master
  head/sys/sys/sysproto.h

Modified: head/sys/compat/freebsd32/freebsd32_proto.h
==============================================================================
--- head/sys/compat/freebsd32/freebsd32_proto.h Wed Mar 29 21:31:45 2017        
(r316181)
+++ head/sys/compat/freebsd32/freebsd32_proto.h Wed Mar 29 22:33:56 2017        
(r316182)
@@ -1139,7 +1139,7 @@ int       freebsd10_freebsd32_pipe(struct thre
 #define        FREEBSD32_SYS_AUE_ofreebsd32_sigprocmask        AUE_SIGPROCMASK
 #define        FREEBSD32_SYS_AUE_ofreebsd32_sigpending AUE_SIGPENDING
 #define        FREEBSD32_SYS_AUE_freebsd32_sigaltstack AUE_SIGALTSTACK
-#define        FREEBSD32_SYS_AUE_freebsd32_ioctl       AUE_NULL
+#define        FREEBSD32_SYS_AUE_freebsd32_ioctl       AUE_IOCTL
 #define        FREEBSD32_SYS_AUE_freebsd32_execve      AUE_EXECVE
 #define        FREEBSD32_SYS_AUE_ofreebsd32_fstat      AUE_FSTAT
 #define        FREEBSD32_SYS_AUE_ofreebsd32_getpagesize        AUE_NULL
@@ -1148,7 +1148,7 @@ int       freebsd10_freebsd32_pipe(struct thre
 #define        FREEBSD32_SYS_AUE_freebsd32_getitimer   AUE_GETITIMER
 #define        FREEBSD32_SYS_AUE_freebsd32_fcntl       AUE_FCNTL
 #define        FREEBSD32_SYS_AUE_freebsd32_select      AUE_SELECT
-#define        FREEBSD32_SYS_AUE_ofreebsd32_sigreturn  AUE_NULL
+#define        FREEBSD32_SYS_AUE_ofreebsd32_sigreturn  AUE_SIGRETURN
 #define        FREEBSD32_SYS_AUE_ofreebsd32_sigvec     AUE_O_SIGVEC
 #define        FREEBSD32_SYS_AUE_ofreebsd32_sigblock   AUE_O_SIGBLOCK
 #define        FREEBSD32_SYS_AUE_ofreebsd32_sigsetmask AUE_O_SIGSETMASK
@@ -1194,48 +1194,48 @@ int     freebsd10_freebsd32_pipe(struct thre
 #define        FREEBSD32_SYS_AUE_freebsd32_nanosleep   AUE_NULL
 #define        FREEBSD32_SYS_AUE_freebsd32_clock_nanosleep     AUE_NULL
 #define        FREEBSD32_SYS_AUE_freebsd32_clock_getcpuclockid2        AUE_NULL
-#define        FREEBSD32_SYS_AUE_freebsd32_aio_read    AUE_NULL
-#define        FREEBSD32_SYS_AUE_freebsd32_aio_write   AUE_NULL
-#define        FREEBSD32_SYS_AUE_freebsd32_lio_listio  AUE_NULL
+#define        FREEBSD32_SYS_AUE_freebsd32_aio_read    AUE_AIO_READ
+#define        FREEBSD32_SYS_AUE_freebsd32_aio_write   AUE_AIO_WRITE
+#define        FREEBSD32_SYS_AUE_freebsd32_lio_listio  AUE_LIO_LISTIO
 #define        FREEBSD32_SYS_AUE_freebsd32_lutimes     AUE_LUTIMES
 #define        FREEBSD32_SYS_AUE_freebsd32_preadv      AUE_PREADV
 #define        FREEBSD32_SYS_AUE_freebsd32_pwritev     AUE_PWRITEV
 #define        FREEBSD32_SYS_AUE_freebsd4_freebsd32_fhstatfs   AUE_FHSTATFS
 #define        FREEBSD32_SYS_AUE_freebsd32_modstat     AUE_NULL
 #define        FREEBSD32_SYS_AUE_freebsd32_kldstat     AUE_NULL
-#define        FREEBSD32_SYS_AUE_freebsd32_aio_return  AUE_NULL
-#define        FREEBSD32_SYS_AUE_freebsd32_aio_suspend AUE_NULL
-#define        FREEBSD32_SYS_AUE_freebsd32_aio_error   AUE_NULL
-#define        FREEBSD32_SYS_AUE_freebsd6_freebsd32_aio_read   AUE_NULL
-#define        FREEBSD32_SYS_AUE_freebsd6_freebsd32_aio_write  AUE_NULL
-#define        FREEBSD32_SYS_AUE_freebsd6_freebsd32_lio_listio AUE_NULL
+#define        FREEBSD32_SYS_AUE_freebsd32_aio_return  AUE_AIO_RETURN
+#define        FREEBSD32_SYS_AUE_freebsd32_aio_suspend AUE_AIO_SUSPEND
+#define        FREEBSD32_SYS_AUE_freebsd32_aio_error   AUE_AIO_ERROR
+#define        FREEBSD32_SYS_AUE_freebsd6_freebsd32_aio_read   AUE_AIO_READ
+#define        FREEBSD32_SYS_AUE_freebsd6_freebsd32_aio_write  AUE_AIO_WRITE
+#define        FREEBSD32_SYS_AUE_freebsd6_freebsd32_lio_listio AUE_LIO_LISTIO
 #define        FREEBSD32_SYS_AUE_freebsd4_freebsd32_sendfile   AUE_SENDFILE
 #define        FREEBSD32_SYS_AUE_freebsd32_jail        AUE_JAIL
 #define        FREEBSD32_SYS_AUE_freebsd4_freebsd32_sigaction  AUE_SIGACTION
 #define        FREEBSD32_SYS_AUE_freebsd4_freebsd32_sigreturn  AUE_SIGRETURN
 #define        FREEBSD32_SYS_AUE_freebsd32_sigtimedwait        AUE_SIGWAIT
 #define        FREEBSD32_SYS_AUE_freebsd32_sigwaitinfo AUE_NULL
-#define        FREEBSD32_SYS_AUE_freebsd32_aio_waitcomplete    AUE_NULL
-#define        FREEBSD32_SYS_AUE_freebsd32_kevent      AUE_NULL
+#define        FREEBSD32_SYS_AUE_freebsd32_aio_waitcomplete    
AUE_AIO_WAITCOMPLETE
+#define        FREEBSD32_SYS_AUE_freebsd32_kevent      AUE_KEVENT
 #define        FREEBSD32_SYS_AUE_freebsd32_nmount      AUE_NMOUNT
 #define        FREEBSD32_SYS_AUE_freebsd32_sendfile    AUE_SENDFILE
-#define        FREEBSD32_SYS_AUE_freebsd32_ksem_init   AUE_NULL
-#define        FREEBSD32_SYS_AUE_freebsd32_ksem_open   AUE_NULL
+#define        FREEBSD32_SYS_AUE_freebsd32_ksem_init   AUE_SEMINIT
+#define        FREEBSD32_SYS_AUE_freebsd32_ksem_open   AUE_SEMOPEN
 #define        FREEBSD32_SYS_AUE_freebsd32_sigaction   AUE_SIGACTION
 #define        FREEBSD32_SYS_AUE_freebsd32_sigreturn   AUE_SIGRETURN
 #define        FREEBSD32_SYS_AUE_freebsd32_getcontext  AUE_NULL
 #define        FREEBSD32_SYS_AUE_freebsd32_setcontext  AUE_NULL
 #define        FREEBSD32_SYS_AUE_freebsd32_swapcontext AUE_NULL
-#define        FREEBSD32_SYS_AUE_freebsd32_ksem_timedwait      AUE_NULL
+#define        FREEBSD32_SYS_AUE_freebsd32_ksem_timedwait      AUE_SEMWAIT
 #define        FREEBSD32_SYS_AUE_freebsd32_thr_suspend AUE_NULL
 #define        FREEBSD32_SYS_AUE_freebsd32_umtx_op     AUE_NULL
-#define        FREEBSD32_SYS_AUE_freebsd32_thr_new     AUE_NULL
-#define        FREEBSD32_SYS_AUE_freebsd32_kmq_open    AUE_NULL
-#define        FREEBSD32_SYS_AUE_freebsd32_kmq_setattr AUE_NULL
-#define        FREEBSD32_SYS_AUE_freebsd32_kmq_timedreceive    AUE_NULL
-#define        FREEBSD32_SYS_AUE_freebsd32_kmq_timedsend       AUE_NULL
-#define        FREEBSD32_SYS_AUE_freebsd32_kmq_notify  AUE_NULL
-#define        FREEBSD32_SYS_AUE_freebsd32_aio_fsync   AUE_NULL
+#define        FREEBSD32_SYS_AUE_freebsd32_thr_new     AUE_THR_NEW
+#define        FREEBSD32_SYS_AUE_freebsd32_kmq_open    AUE_MQ_OPEN
+#define        FREEBSD32_SYS_AUE_freebsd32_kmq_setattr AUE_MQ_SETATTR
+#define        FREEBSD32_SYS_AUE_freebsd32_kmq_timedreceive    
AUE_MQ_TIMEDRECEIVE
+#define        FREEBSD32_SYS_AUE_freebsd32_kmq_timedsend       AUE_MQ_TIMEDSEND
+#define        FREEBSD32_SYS_AUE_freebsd32_kmq_notify  AUE_MQ_NOTIFY
+#define        FREEBSD32_SYS_AUE_freebsd32_aio_fsync   AUE_AIO_FSYNC
 #define        FREEBSD32_SYS_AUE_freebsd32_pread       AUE_PREAD
 #define        FREEBSD32_SYS_AUE_freebsd32_pwrite      AUE_PWRITE
 #define        FREEBSD32_SYS_AUE_freebsd32_mmap        AUE_MMAP
@@ -1256,23 +1256,23 @@ int     freebsd10_freebsd32_pipe(struct thre
 #define        FREEBSD32_SYS_AUE_freebsd32_fexecve     AUE_FEXECVE
 #define        FREEBSD32_SYS_AUE_freebsd32_fstatat     AUE_FSTATAT
 #define        FREEBSD32_SYS_AUE_freebsd32_futimesat   AUE_FUTIMESAT
-#define        FREEBSD32_SYS_AUE_freebsd32_jail_get    AUE_NULL
-#define        FREEBSD32_SYS_AUE_freebsd32_jail_set    AUE_NULL
+#define        FREEBSD32_SYS_AUE_freebsd32_jail_get    AUE_JAIL_GET
+#define        FREEBSD32_SYS_AUE_freebsd32_jail_set    AUE_JAIL_SET
 #define        FREEBSD32_SYS_AUE_freebsd32_semctl      AUE_SEMCTL
 #define        FREEBSD32_SYS_AUE_freebsd32_msgctl      AUE_MSGCTL
 #define        FREEBSD32_SYS_AUE_freebsd32_shmctl      AUE_SHMCTL
 #define        FREEBSD32_SYS_AUE_freebsd32_pselect     AUE_SELECT
-#define        FREEBSD32_SYS_AUE_freebsd32_posix_fallocate     AUE_NULL
-#define        FREEBSD32_SYS_AUE_freebsd32_posix_fadvise       AUE_NULL
+#define        FREEBSD32_SYS_AUE_freebsd32_posix_fallocate     
AUE_POSIX_FALLOCATE
+#define        FREEBSD32_SYS_AUE_freebsd32_posix_fadvise       
AUE_POSIX_FADVISE
 #define        FREEBSD32_SYS_AUE_freebsd32_wait6       AUE_WAIT6
-#define        FREEBSD32_SYS_AUE_freebsd32_posix_fallocate     AUE_NULL
-#define        FREEBSD32_SYS_AUE_freebsd32_posix_fadvise       AUE_NULL
+#define        FREEBSD32_SYS_AUE_freebsd32_posix_fallocate     
AUE_POSIX_FALLOCATE
+#define        FREEBSD32_SYS_AUE_freebsd32_posix_fadvise       
AUE_POSIX_FADVISE
 #define        FREEBSD32_SYS_AUE_freebsd32_wait6       AUE_WAIT6
 #define        FREEBSD32_SYS_AUE_freebsd32_cap_ioctls_limit    
AUE_CAP_IOCTLS_LIMIT
 #define        FREEBSD32_SYS_AUE_freebsd32_cap_ioctls_get      
AUE_CAP_IOCTLS_GET
-#define        FREEBSD32_SYS_AUE_freebsd32_aio_mlock   AUE_NULL
-#define        FREEBSD32_SYS_AUE_freebsd32_procctl     AUE_NULL
-#define        FREEBSD32_SYS_AUE_freebsd32_procctl     AUE_NULL
+#define        FREEBSD32_SYS_AUE_freebsd32_aio_mlock   AUE_AIO_MLOCK
+#define        FREEBSD32_SYS_AUE_freebsd32_procctl     AUE_PROCCTL
+#define        FREEBSD32_SYS_AUE_freebsd32_procctl     AUE_PROCCTL
 #define        FREEBSD32_SYS_AUE_freebsd32_ppoll       AUE_POLL
 #define        FREEBSD32_SYS_AUE_freebsd32_futimens    AUE_FUTIMES
 #define        FREEBSD32_SYS_AUE_freebsd32_utimensat   AUE_FUTIMESAT

Modified: head/sys/compat/freebsd32/freebsd32_sysent.c
==============================================================================
--- head/sys/compat/freebsd32/freebsd32_sysent.c        Wed Mar 29 21:31:45 
2017        (r316181)
+++ head/sys/compat/freebsd32/freebsd32_sysent.c        Wed Mar 29 22:33:56 
2017        (r316182)
@@ -106,7 +106,7 @@ struct sysent freebsd32_sysent[] = {
        { AS(acct_args), (sy_call_t *)sys_acct, AUE_ACCT, NULL, 0, 0, 0, 
SY_THR_STATIC },       /* 51 = acct */
        { compat(0,freebsd32_sigpending), AUE_SIGPENDING, NULL, 0, 0, 
SYF_CAPENABLED, SY_THR_STATIC },  /* 52 = old freebsd32_sigpending */
        { AS(freebsd32_sigaltstack_args), (sy_call_t *)freebsd32_sigaltstack, 
AUE_SIGALTSTACK, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },     /* 53 = 
freebsd32_sigaltstack */
-       { AS(freebsd32_ioctl_args), (sy_call_t *)freebsd32_ioctl, AUE_NULL, 
NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },        /* 54 = freebsd32_ioctl */
+       { AS(freebsd32_ioctl_args), (sy_call_t *)freebsd32_ioctl, AUE_IOCTL, 
NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },       /* 54 = freebsd32_ioctl */
        { AS(reboot_args), (sy_call_t *)sys_reboot, AUE_REBOOT, NULL, 0, 0, 0, 
SY_THR_STATIC }, /* 55 = reboot */
        { AS(revoke_args), (sy_call_t *)sys_revoke, AUE_REVOKE, NULL, 0, 0, 0, 
SY_THR_STATIC }, /* 56 = revoke */
        { AS(symlink_args), (sy_call_t *)sys_symlink, AUE_SYMLINK, NULL, 0, 0, 
0, SY_THR_STATIC },      /* 57 = symlink */
@@ -155,7 +155,7 @@ struct sysent freebsd32_sysent[] = {
        { AS(getpriority_args), (sy_call_t *)sys_getpriority, AUE_GETPRIORITY, 
NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },     /* 100 = getpriority */
        { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },      
                /* 101 = obsolete osend */
        { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },      
                /* 102 = obsolete orecv */
-       { compat(AS(ofreebsd32_sigreturn_args),freebsd32_sigreturn), AUE_NULL, 
NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },     /* 103 = old 
freebsd32_sigreturn */
+       { compat(AS(ofreebsd32_sigreturn_args),freebsd32_sigreturn), 
AUE_SIGRETURN, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },        /* 103 = old 
freebsd32_sigreturn */
        { AS(bind_args), (sy_call_t *)sys_bind, AUE_BIND, NULL, 0, 0, 0, 
SY_THR_STATIC },       /* 104 = bind */
        { AS(setsockopt_args), (sy_call_t *)sys_setsockopt, AUE_SETSOCKOPT, 
NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },        /* 105 = setsockopt */
        { AS(listen_args), (sy_call_t *)sys_listen, AUE_LISTEN, NULL, 0, 0, 
SYF_CAPENABLED, SY_THR_STATIC },    /* 106 = listen */
@@ -307,9 +307,9 @@ struct sysent freebsd32_sysent[] = {
        { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },      
                /* 252 = obsolete openbsd_poll */
        { 0, (sy_call_t *)sys_issetugid, AUE_ISSETUGID, NULL, 0, 0, 
SYF_CAPENABLED, SY_THR_STATIC },    /* 253 = issetugid */
        { AS(lchown_args), (sy_call_t *)sys_lchown, AUE_LCHOWN, NULL, 0, 0, 0, 
SY_THR_STATIC }, /* 254 = lchown */
-       { AS(freebsd32_aio_read_args), (sy_call_t *)freebsd32_aio_read, 
AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },  /* 255 = 
freebsd32_aio_read */
-       { AS(freebsd32_aio_write_args), (sy_call_t *)freebsd32_aio_write, 
AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },        /* 256 = 
freebsd32_aio_write */
-       { AS(freebsd32_lio_listio_args), (sy_call_t *)freebsd32_lio_listio, 
AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },      /* 257 = 
freebsd32_lio_listio */
+       { AS(freebsd32_aio_read_args), (sy_call_t *)freebsd32_aio_read, 
AUE_AIO_READ, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },      /* 255 = 
freebsd32_aio_read */
+       { AS(freebsd32_aio_write_args), (sy_call_t *)freebsd32_aio_write, 
AUE_AIO_WRITE, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },   /* 256 = 
freebsd32_aio_write */
+       { AS(freebsd32_lio_listio_args), (sy_call_t *)freebsd32_lio_listio, 
AUE_LIO_LISTIO, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },        /* 257 = 
freebsd32_lio_listio */
        { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },      
                /* 258 = nosys */
        { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },      
                /* 259 = nosys */
        { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },      
                /* 260 = nosys */
@@ -366,13 +366,13 @@ struct sysent freebsd32_sysent[] = {
        { AS(setresuid_args), (sy_call_t *)sys_setresuid, AUE_SETRESUID, NULL, 
0, 0, SYF_CAPENABLED, SY_THR_STATIC },   /* 311 = setresuid */
        { AS(setresgid_args), (sy_call_t *)sys_setresgid, AUE_SETRESGID, NULL, 
0, 0, SYF_CAPENABLED, SY_THR_STATIC },   /* 312 = setresgid */
        { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },      
                /* 313 = obsolete signanosleep */
-       { AS(freebsd32_aio_return_args), (sy_call_t *)freebsd32_aio_return, 
AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },      /* 314 = 
freebsd32_aio_return */
-       { AS(freebsd32_aio_suspend_args), (sy_call_t *)freebsd32_aio_suspend, 
AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },    /* 315 = 
freebsd32_aio_suspend */
-       { AS(aio_cancel_args), (sy_call_t *)sys_aio_cancel, AUE_NULL, NULL, 0, 
0, SYF_CAPENABLED, SY_THR_STATIC },      /* 316 = aio_cancel */
-       { AS(freebsd32_aio_error_args), (sy_call_t *)freebsd32_aio_error, 
AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },        /* 317 = 
freebsd32_aio_error */
-       { compat6(AS(freebsd6_freebsd32_aio_read_args),freebsd32_aio_read), 
AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },      /* 318 = freebsd6 
freebsd32_aio_read */
-       { compat6(AS(freebsd6_freebsd32_aio_write_args),freebsd32_aio_write), 
AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },    /* 319 = freebsd6 
freebsd32_aio_write */
-       { compat6(AS(freebsd6_freebsd32_lio_listio_args),freebsd32_lio_listio), 
AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },  /* 320 = freebsd6 
freebsd32_lio_listio */
+       { AS(freebsd32_aio_return_args), (sy_call_t *)freebsd32_aio_return, 
AUE_AIO_RETURN, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },        /* 314 = 
freebsd32_aio_return */
+       { AS(freebsd32_aio_suspend_args), (sy_call_t *)freebsd32_aio_suspend, 
AUE_AIO_SUSPEND, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },     /* 315 = 
freebsd32_aio_suspend */
+       { AS(aio_cancel_args), (sy_call_t *)sys_aio_cancel, AUE_AIO_CANCEL, 
NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },        /* 316 = aio_cancel */
+       { AS(freebsd32_aio_error_args), (sy_call_t *)freebsd32_aio_error, 
AUE_AIO_ERROR, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },   /* 317 = 
freebsd32_aio_error */
+       { compat6(AS(freebsd6_freebsd32_aio_read_args),freebsd32_aio_read), 
AUE_AIO_READ, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },  /* 318 = freebsd6 
freebsd32_aio_read */
+       { compat6(AS(freebsd6_freebsd32_aio_write_args),freebsd32_aio_write), 
AUE_AIO_WRITE, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },       /* 319 = 
freebsd6 freebsd32_aio_write */
+       { compat6(AS(freebsd6_freebsd32_lio_listio_args),freebsd32_lio_listio), 
AUE_LIO_LISTIO, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },    /* 320 = 
freebsd6 freebsd32_lio_listio */
        { 0, (sy_call_t *)sys_yield, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, 
SY_THR_STATIC },     /* 321 = yield */
        { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },      
                /* 322 = obsolete thr_sleep */
        { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },      
                /* 323 = obsolete thr_wakeup */
@@ -399,23 +399,23 @@ struct sysent freebsd32_sysent[] = {
        { compat4(AS(freebsd4_freebsd32_sigreturn_args),freebsd32_sigreturn), 
AUE_SIGRETURN, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },       /* 344 = 
freebsd4 freebsd32_sigreturn */
        { AS(freebsd32_sigtimedwait_args), (sy_call_t *)freebsd32_sigtimedwait, 
AUE_SIGWAIT, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },       /* 345 = 
freebsd32_sigtimedwait */
        { AS(freebsd32_sigwaitinfo_args), (sy_call_t *)freebsd32_sigwaitinfo, 
AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },    /* 346 = 
freebsd32_sigwaitinfo */
-       { AS(__acl_get_file_args), (sy_call_t *)sys___acl_get_file, AUE_NULL, 
NULL, 0, 0, 0, SY_THR_STATIC },   /* 347 = __acl_get_file */
-       { AS(__acl_set_file_args), (sy_call_t *)sys___acl_set_file, AUE_NULL, 
NULL, 0, 0, 0, SY_THR_STATIC },   /* 348 = __acl_set_file */
-       { AS(__acl_get_fd_args), (sy_call_t *)sys___acl_get_fd, AUE_NULL, NULL, 
0, 0, SYF_CAPENABLED, SY_THR_STATIC },  /* 349 = __acl_get_fd */
-       { AS(__acl_set_fd_args), (sy_call_t *)sys___acl_set_fd, AUE_NULL, NULL, 
0, 0, SYF_CAPENABLED, SY_THR_STATIC },  /* 350 = __acl_set_fd */
-       { AS(__acl_delete_file_args), (sy_call_t *)sys___acl_delete_file, 
AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },     /* 351 = __acl_delete_file */
-       { AS(__acl_delete_fd_args), (sy_call_t *)sys___acl_delete_fd, AUE_NULL, 
NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },    /* 352 = __acl_delete_fd */
-       { AS(__acl_aclcheck_file_args), (sy_call_t *)sys___acl_aclcheck_file, 
AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 353 = __acl_aclcheck_file */
-       { AS(__acl_aclcheck_fd_args), (sy_call_t *)sys___acl_aclcheck_fd, 
AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },        /* 354 = 
__acl_aclcheck_fd */
+       { AS(__acl_get_file_args), (sy_call_t *)sys___acl_get_file, 
AUE_ACL_GET_FILE, NULL, 0, 0, 0, SY_THR_STATIC },   /* 347 = __acl_get_file */
+       { AS(__acl_set_file_args), (sy_call_t *)sys___acl_set_file, 
AUE_ACL_SET_FILE, NULL, 0, 0, 0, SY_THR_STATIC },   /* 348 = __acl_set_file */
+       { AS(__acl_get_fd_args), (sy_call_t *)sys___acl_get_fd, AUE_ACL_GET_FD, 
NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },    /* 349 = __acl_get_fd */
+       { AS(__acl_set_fd_args), (sy_call_t *)sys___acl_set_fd, AUE_ACL_SET_FD, 
NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },    /* 350 = __acl_set_fd */
+       { AS(__acl_delete_file_args), (sy_call_t *)sys___acl_delete_file, 
AUE_ACL_DELETE_FILE, NULL, 0, 0, 0, SY_THR_STATIC },  /* 351 = 
__acl_delete_file */
+       { AS(__acl_delete_fd_args), (sy_call_t *)sys___acl_delete_fd, 
AUE_ACL_DELETE_FD, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },   /* 352 = 
__acl_delete_fd */
+       { AS(__acl_aclcheck_file_args), (sy_call_t *)sys___acl_aclcheck_file, 
AUE_ACL_CHECK_FILE, NULL, 0, 0, 0, SY_THR_STATIC },       /* 353 = 
__acl_aclcheck_file */
+       { AS(__acl_aclcheck_fd_args), (sy_call_t *)sys___acl_aclcheck_fd, 
AUE_ACL_CHECK_FD, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },        /* 354 = 
__acl_aclcheck_fd */
        { AS(extattrctl_args), (sy_call_t *)sys_extattrctl, AUE_EXTATTRCTL, 
NULL, 0, 0, 0, SY_THR_STATIC },     /* 355 = extattrctl */
        { AS(extattr_set_file_args), (sy_call_t *)sys_extattr_set_file, 
AUE_EXTATTR_SET_FILE, NULL, 0, 0, 0, SY_THR_STATIC },   /* 356 = 
extattr_set_file */
        { AS(extattr_get_file_args), (sy_call_t *)sys_extattr_get_file, 
AUE_EXTATTR_GET_FILE, NULL, 0, 0, 0, SY_THR_STATIC },   /* 357 = 
extattr_get_file */
        { AS(extattr_delete_file_args), (sy_call_t *)sys_extattr_delete_file, 
AUE_EXTATTR_DELETE_FILE, NULL, 0, 0, 0, SY_THR_STATIC },  /* 358 = 
extattr_delete_file */
-       { AS(freebsd32_aio_waitcomplete_args), (sy_call_t 
*)freebsd32_aio_waitcomplete, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, 
SY_THR_STATIC },  /* 359 = freebsd32_aio_waitcomplete */
+       { AS(freebsd32_aio_waitcomplete_args), (sy_call_t 
*)freebsd32_aio_waitcomplete, AUE_AIO_WAITCOMPLETE, NULL, 0, 0, SYF_CAPENABLED, 
SY_THR_STATIC },      /* 359 = freebsd32_aio_waitcomplete */
        { AS(getresuid_args), (sy_call_t *)sys_getresuid, AUE_GETRESUID, NULL, 
0, 0, SYF_CAPENABLED, SY_THR_STATIC },   /* 360 = getresuid */
        { AS(getresgid_args), (sy_call_t *)sys_getresgid, AUE_GETRESGID, NULL, 
0, 0, SYF_CAPENABLED, SY_THR_STATIC },   /* 361 = getresgid */
        { 0, (sy_call_t *)sys_kqueue, AUE_KQUEUE, NULL, 0, 0, SYF_CAPENABLED, 
SY_THR_STATIC },  /* 362 = kqueue */
-       { AS(freebsd32_kevent_args), (sy_call_t *)freebsd32_kevent, AUE_NULL, 
NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },      /* 363 = freebsd32_kevent */
+       { AS(freebsd32_kevent_args), (sy_call_t *)freebsd32_kevent, AUE_KEVENT, 
NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },    /* 363 = freebsd32_kevent */
        { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },      
                /* 364 = __cap_get_proc */
        { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },      
                /* 365 = __cap_set_proc */
        { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },      
                /* 366 = __cap_get_fd */
@@ -426,7 +426,7 @@ struct sysent freebsd32_sysent[] = {
        { AS(extattr_set_fd_args), (sy_call_t *)sys_extattr_set_fd, 
AUE_EXTATTR_SET_FD, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },    /* 371 = 
extattr_set_fd */
        { AS(extattr_get_fd_args), (sy_call_t *)sys_extattr_get_fd, 
AUE_EXTATTR_GET_FD, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },    /* 372 = 
extattr_get_fd */
        { AS(extattr_delete_fd_args), (sy_call_t *)sys_extattr_delete_fd, 
AUE_EXTATTR_DELETE_FD, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },   /* 373 = 
extattr_delete_fd */
-       { AS(__setugid_args), (sy_call_t *)sys___setugid, AUE_NULL, NULL, 0, 0, 
0, SY_THR_STATIC },     /* 374 = __setugid */
+       { AS(__setugid_args), (sy_call_t *)sys___setugid, AUE_SETUGID, NULL, 0, 
0, 0, SY_THR_STATIC },  /* 374 = __setugid */
        { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },      
                /* 375 = nfsclnt */
        { AS(eaccess_args), (sy_call_t *)sys_eaccess, AUE_EACCESS, NULL, 0, 0, 
0, SY_THR_STATIC },      /* 376 = eaccess */
        { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },      
                /* 377 = afs_syscall */
@@ -477,18 +477,18 @@ struct sysent freebsd32_sysent[] = {
        { AS(freebsd32_setcontext_args), (sy_call_t *)freebsd32_setcontext, 
AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },      /* 422 = 
freebsd32_setcontext */
        { AS(freebsd32_swapcontext_args), (sy_call_t *)freebsd32_swapcontext, 
AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 423 = freebsd32_swapcontext */
        { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },      
                /* 424 = swapoff */
-       { AS(__acl_get_link_args), (sy_call_t *)sys___acl_get_link, AUE_NULL, 
NULL, 0, 0, 0, SY_THR_STATIC },   /* 425 = __acl_get_link */
-       { AS(__acl_set_link_args), (sy_call_t *)sys___acl_set_link, AUE_NULL, 
NULL, 0, 0, 0, SY_THR_STATIC },   /* 426 = __acl_set_link */
-       { AS(__acl_delete_link_args), (sy_call_t *)sys___acl_delete_link, 
AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },     /* 427 = __acl_delete_link */
-       { AS(__acl_aclcheck_link_args), (sy_call_t *)sys___acl_aclcheck_link, 
AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 428 = __acl_aclcheck_link */
+       { AS(__acl_get_link_args), (sy_call_t *)sys___acl_get_link, 
AUE_ACL_GET_LINK, NULL, 0, 0, 0, SY_THR_STATIC },   /* 425 = __acl_get_link */
+       { AS(__acl_set_link_args), (sy_call_t *)sys___acl_set_link, 
AUE_ACL_SET_LINK, NULL, 0, 0, 0, SY_THR_STATIC },   /* 426 = __acl_set_link */
+       { AS(__acl_delete_link_args), (sy_call_t *)sys___acl_delete_link, 
AUE_ACL_DELETE_LINK, NULL, 0, 0, 0, SY_THR_STATIC },  /* 427 = 
__acl_delete_link */
+       { AS(__acl_aclcheck_link_args), (sy_call_t *)sys___acl_aclcheck_link, 
AUE_ACL_CHECK_LINK, NULL, 0, 0, 0, SY_THR_STATIC },       /* 428 = 
__acl_aclcheck_link */
        { AS(sigwait_args), (sy_call_t *)sys_sigwait, AUE_SIGWAIT, NULL, 0, 0, 
SYF_CAPENABLED, SY_THR_STATIC }, /* 429 = sigwait */
        { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },      
                /* 430 = thr_create; */
-       { AS(thr_exit_args), (sy_call_t *)sys_thr_exit, AUE_NULL, NULL, 0, 0, 
SYF_CAPENABLED, SY_THR_STATIC },  /* 431 = thr_exit */
+       { AS(thr_exit_args), (sy_call_t *)sys_thr_exit, AUE_THR_EXIT, NULL, 0, 
0, SYF_CAPENABLED, SY_THR_STATIC },      /* 431 = thr_exit */
        { AS(thr_self_args), (sy_call_t *)sys_thr_self, AUE_NULL, NULL, 0, 0, 
SYF_CAPENABLED, SY_THR_STATIC },  /* 432 = thr_self */
-       { AS(thr_kill_args), (sy_call_t *)sys_thr_kill, AUE_NULL, NULL, 0, 0, 
SYF_CAPENABLED, SY_THR_STATIC },  /* 433 = thr_kill */
+       { AS(thr_kill_args), (sy_call_t *)sys_thr_kill, AUE_THR_KILL, NULL, 0, 
0, SYF_CAPENABLED, SY_THR_STATIC },      /* 433 = thr_kill */
        { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },      
                /* 434 = nosys */
        { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },      
                /* 435 = nosys */
-       { AS(jail_attach_args), (sy_call_t *)sys_jail_attach, AUE_NULL, NULL, 
0, 0, 0, SY_THR_STATIC }, /* 436 = jail_attach */
+       { AS(jail_attach_args), (sy_call_t *)sys_jail_attach, AUE_JAIL_ATTACH, 
NULL, 0, 0, 0, SY_THR_STATIC },  /* 436 = jail_attach */
        { AS(extattr_list_fd_args), (sy_call_t *)sys_extattr_list_fd, 
AUE_EXTATTR_LIST_FD, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 437 = 
extattr_list_fd */
        { AS(extattr_list_file_args), (sy_call_t *)sys_extattr_list_file, 
AUE_EXTATTR_LIST_FILE, NULL, 0, 0, 0, SY_THR_STATIC },        /* 438 = 
extattr_list_file */
        { AS(extattr_list_link_args), (sy_call_t *)sys_extattr_list_link, 
AUE_EXTATTR_LIST_LINK, NULL, 0, 0, 0, SY_THR_STATIC },        /* 439 = 
extattr_list_link */
@@ -507,7 +507,7 @@ struct sysent freebsd32_sysent[] = {
        { AS(setaudit_addr_args), (sy_call_t *)sys_setaudit_addr, 
AUE_SETAUDIT_ADDR, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },       /* 452 = 
setaudit_addr */
        { AS(auditctl_args), (sy_call_t *)sys_auditctl, AUE_AUDITCTL, NULL, 0, 
0, 0, SY_THR_STATIC },   /* 453 = auditctl */
        { AS(freebsd32_umtx_op_args), (sy_call_t *)freebsd32_umtx_op, AUE_NULL, 
NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },    /* 454 = freebsd32_umtx_op */
-       { AS(freebsd32_thr_new_args), (sy_call_t *)freebsd32_thr_new, AUE_NULL, 
NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },    /* 455 = freebsd32_thr_new */
+       { AS(freebsd32_thr_new_args), (sy_call_t *)freebsd32_thr_new, 
AUE_THR_NEW, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 455 = 
freebsd32_thr_new */
        { AS(sigqueue_args), (sy_call_t *)sys_sigqueue, AUE_NULL, NULL, 0, 0, 
SYF_CAPENABLED, SY_THR_STATIC },  /* 456 = sigqueue */
        { AS(freebsd32_kmq_open_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 
0, 0, 0, SY_THR_ABSENT },        /* 457 = freebsd32_kmq_open */
        { AS(freebsd32_kmq_setattr_args), (sy_call_t *)lkmressys, AUE_NULL, 
NULL, 0, 0, SYF_CAPENABLED, SY_THR_ABSENT },        /* 458 = 
freebsd32_kmq_setattr */
@@ -517,7 +517,7 @@ struct sysent freebsd32_sysent[] = {
        { AS(kmq_unlink_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0, 
SY_THR_ABSENT },        /* 462 = kmq_unlink */
        { AS(abort2_args), (sy_call_t *)sys_abort2, AUE_NULL, NULL, 0, 0, 
SYF_CAPENABLED, SY_THR_STATIC },      /* 463 = abort2 */
        { AS(thr_set_name_args), (sy_call_t *)sys_thr_set_name, AUE_NULL, NULL, 
0, 0, SYF_CAPENABLED, SY_THR_STATIC },  /* 464 = thr_set_name */
-       { AS(freebsd32_aio_fsync_args), (sy_call_t *)freebsd32_aio_fsync, 
AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },     /* 465 = freebsd32_aio_fsync */
+       { AS(freebsd32_aio_fsync_args), (sy_call_t *)freebsd32_aio_fsync, 
AUE_AIO_FSYNC, NULL, 0, 0, 0, SY_THR_STATIC },        /* 465 = 
freebsd32_aio_fsync */
        { AS(rtprio_thread_args), (sy_call_t *)sys_rtprio_thread, AUE_RTPRIO, 
NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },      /* 466 = rtprio_thread */
        { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },      
                /* 467 = nosys */
        { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },      
                /* 468 = nosys */
@@ -542,7 +542,7 @@ struct sysent freebsd32_sysent[] = {
        { AS(freebsd32_truncate_args), (sy_call_t *)freebsd32_truncate, 
AUE_TRUNCATE, NULL, 0, 0, 0, SY_THR_STATIC },   /* 479 = freebsd32_truncate */
        { AS(freebsd32_ftruncate_args), (sy_call_t *)freebsd32_ftruncate, 
AUE_FTRUNCATE, NULL, 0, 0, 0, SY_THR_STATIC },        /* 480 = 
freebsd32_ftruncate */
 #endif
-       { AS(thr_kill2_args), (sy_call_t *)sys_thr_kill2, AUE_KILL, NULL, 0, 0, 
0, SY_THR_STATIC },     /* 481 = thr_kill2 */
+       { AS(thr_kill2_args), (sy_call_t *)sys_thr_kill2, AUE_THR_KILL2, NULL, 
0, 0, 0, SY_THR_STATIC },        /* 481 = thr_kill2 */
        { AS(shm_open_args), (sy_call_t *)sys_shm_open, AUE_SHMOPEN, NULL, 0, 
0, SYF_CAPENABLED, SY_THR_STATIC },       /* 482 = shm_open */
        { AS(shm_unlink_args), (sy_call_t *)sys_shm_unlink, AUE_SHMUNLINK, 
NULL, 0, 0, 0, SY_THR_STATIC },      /* 483 = shm_unlink */
        { AS(cpuset_args), (sy_call_t *)sys_cpuset, AUE_NULL, NULL, 0, 0, 0, 
SY_THR_STATIC },   /* 484 = cpuset */
@@ -571,9 +571,9 @@ struct sysent freebsd32_sysent[] = {
        { AS(unlinkat_args), (sy_call_t *)sys_unlinkat, AUE_UNLINKAT, NULL, 0, 
0, SYF_CAPENABLED, SY_THR_STATIC },      /* 503 = unlinkat */
        { AS(posix_openpt_args), (sy_call_t *)sys_posix_openpt, 
AUE_POSIX_OPENPT, NULL, 0, 0, 0, SY_THR_STATIC },       /* 504 = posix_openpt */
        { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },      
                /* 505 = gssd_syscall */
-       { AS(freebsd32_jail_get_args), (sy_call_t *)freebsd32_jail_get, 
AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },       /* 506 = freebsd32_jail_get */
-       { AS(freebsd32_jail_set_args), (sy_call_t *)freebsd32_jail_set, 
AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },       /* 507 = freebsd32_jail_set */
-       { AS(jail_remove_args), (sy_call_t *)sys_jail_remove, AUE_NULL, NULL, 
0, 0, 0, SY_THR_STATIC }, /* 508 = jail_remove */
+       { AS(freebsd32_jail_get_args), (sy_call_t *)freebsd32_jail_get, 
AUE_JAIL_GET, NULL, 0, 0, 0, SY_THR_STATIC },   /* 506 = freebsd32_jail_get */
+       { AS(freebsd32_jail_set_args), (sy_call_t *)freebsd32_jail_set, 
AUE_JAIL_SET, NULL, 0, 0, 0, SY_THR_STATIC },   /* 507 = freebsd32_jail_set */
+       { AS(jail_remove_args), (sy_call_t *)sys_jail_remove, AUE_JAIL_REMOVE, 
NULL, 0, 0, 0, SY_THR_STATIC },  /* 508 = jail_remove */
        { AS(closefrom_args), (sy_call_t *)sys_closefrom, AUE_CLOSEFROM, NULL, 
0, 0, SYF_CAPENABLED, SY_THR_STATIC },   /* 509 = closefrom */
        { AS(freebsd32_semctl_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 
0, 0, SY_THR_ABSENT },  /* 510 = freebsd32_semctl */
        { AS(freebsd32_msgctl_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 
0, 0, SY_THR_ABSENT },  /* 511 = freebsd32_msgctl */
@@ -588,20 +588,20 @@ struct sysent freebsd32_sysent[] = {
        { AS(pdgetpid_args), (sy_call_t *)sys_pdgetpid, AUE_PDGETPID, NULL, 0, 
0, SYF_CAPENABLED, SY_THR_STATIC },      /* 520 = pdgetpid */
        { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },      
                /* 521 = pdwait4 */
        { AS(freebsd32_pselect_args), (sy_call_t *)freebsd32_pselect, 
AUE_SELECT, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },  /* 522 = 
freebsd32_pselect */
-       { AS(getloginclass_args), (sy_call_t *)sys_getloginclass, AUE_NULL, 
NULL, 0, 0, 0, SY_THR_STATIC },     /* 523 = getloginclass */
-       { AS(setloginclass_args), (sy_call_t *)sys_setloginclass, AUE_NULL, 
NULL, 0, 0, 0, SY_THR_STATIC },     /* 524 = setloginclass */
+       { AS(getloginclass_args), (sy_call_t *)sys_getloginclass, 
AUE_GETLOGINCLASS, NULL, 0, 0, 0, SY_THR_STATIC },    /* 523 = getloginclass */
+       { AS(setloginclass_args), (sy_call_t *)sys_setloginclass, 
AUE_SETLOGINCLASS, NULL, 0, 0, 0, SY_THR_STATIC },    /* 524 = setloginclass */
        { AS(rctl_get_racct_args), (sy_call_t *)sys_rctl_get_racct, AUE_NULL, 
NULL, 0, 0, 0, SY_THR_STATIC },   /* 525 = rctl_get_racct */
        { AS(rctl_get_rules_args), (sy_call_t *)sys_rctl_get_rules, AUE_NULL, 
NULL, 0, 0, 0, SY_THR_STATIC },   /* 526 = rctl_get_rules */
        { AS(rctl_get_limits_args), (sy_call_t *)sys_rctl_get_limits, AUE_NULL, 
NULL, 0, 0, 0, SY_THR_STATIC }, /* 527 = rctl_get_limits */
        { AS(rctl_add_rule_args), (sy_call_t *)sys_rctl_add_rule, AUE_NULL, 
NULL, 0, 0, 0, SY_THR_STATIC },     /* 528 = rctl_add_rule */
        { AS(rctl_remove_rule_args), (sy_call_t *)sys_rctl_remove_rule, 
AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },       /* 529 = rctl_remove_rule */
 #ifdef PAD64_REQUIRED
-       { AS(freebsd32_posix_fallocate_args), (sy_call_t 
*)freebsd32_posix_fallocate, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 530 = 
freebsd32_posix_fallocate */
-       { AS(freebsd32_posix_fadvise_args), (sy_call_t 
*)freebsd32_posix_fadvise, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },     /* 531 
= freebsd32_posix_fadvise */
+       { AS(freebsd32_posix_fallocate_args), (sy_call_t 
*)freebsd32_posix_fallocate, AUE_POSIX_FALLOCATE, NULL, 0, 0, 0, SY_THR_STATIC 
},      /* 530 = freebsd32_posix_fallocate */
+       { AS(freebsd32_posix_fadvise_args), (sy_call_t 
*)freebsd32_posix_fadvise, AUE_POSIX_FADVISE, NULL, 0, 0, 0, SY_THR_STATIC },   
 /* 531 = freebsd32_posix_fadvise */
        { AS(freebsd32_wait6_args), (sy_call_t *)freebsd32_wait6, AUE_WAIT6, 
NULL, 0, 0, 0, SY_THR_STATIC },    /* 532 = freebsd32_wait6 */
 #else
-       { AS(freebsd32_posix_fallocate_args), (sy_call_t 
*)freebsd32_posix_fallocate, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 530 = 
freebsd32_posix_fallocate */
-       { AS(freebsd32_posix_fadvise_args), (sy_call_t 
*)freebsd32_posix_fadvise, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },     /* 531 
= freebsd32_posix_fadvise */
+       { AS(freebsd32_posix_fallocate_args), (sy_call_t 
*)freebsd32_posix_fallocate, AUE_POSIX_FALLOCATE, NULL, 0, 0, 0, SY_THR_STATIC 
},      /* 530 = freebsd32_posix_fallocate */
+       { AS(freebsd32_posix_fadvise_args), (sy_call_t 
*)freebsd32_posix_fadvise, AUE_POSIX_FADVISE, NULL, 0, 0, 0, SY_THR_STATIC },   
 /* 531 = freebsd32_posix_fadvise */
        { AS(freebsd32_wait6_args), (sy_call_t *)freebsd32_wait6, AUE_WAIT6, 
NULL, 0, 0, 0, SY_THR_STATIC },    /* 532 = freebsd32_wait6 */
 #endif
        { AS(cap_rights_limit_args), (sy_call_t *)sys_cap_rights_limit, 
AUE_CAP_RIGHTS_LIMIT, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },      /* 533 
= cap_rights_limit */
@@ -614,11 +614,11 @@ struct sysent freebsd32_sysent[] = {
        { AS(chflagsat_args), (sy_call_t *)sys_chflagsat, AUE_CHFLAGSAT, NULL, 
0, 0, SYF_CAPENABLED, SY_THR_STATIC },   /* 540 = chflagsat */
        { AS(accept4_args), (sy_call_t *)sys_accept4, AUE_ACCEPT, NULL, 0, 0, 
SYF_CAPENABLED, SY_THR_STATIC },  /* 541 = accept4 */
        { AS(pipe2_args), (sy_call_t *)sys_pipe2, AUE_PIPE, NULL, 0, 0, 
SYF_CAPENABLED, SY_THR_STATIC },        /* 542 = pipe2 */
-       { AS(freebsd32_aio_mlock_args), (sy_call_t *)freebsd32_aio_mlock, 
AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },     /* 543 = freebsd32_aio_mlock */
+       { AS(freebsd32_aio_mlock_args), (sy_call_t *)freebsd32_aio_mlock, 
AUE_AIO_MLOCK, NULL, 0, 0, 0, SY_THR_STATIC },        /* 543 = 
freebsd32_aio_mlock */
 #ifdef PAD64_REQUIRED
-       { AS(freebsd32_procctl_args), (sy_call_t *)freebsd32_procctl, AUE_NULL, 
NULL, 0, 0, 0, SY_THR_STATIC }, /* 544 = freebsd32_procctl */
+       { AS(freebsd32_procctl_args), (sy_call_t *)freebsd32_procctl, 
AUE_PROCCTL, NULL, 0, 0, 0, SY_THR_STATIC },      /* 544 = freebsd32_procctl */
 #else
-       { AS(freebsd32_procctl_args), (sy_call_t *)freebsd32_procctl, AUE_NULL, 
NULL, 0, 0, 0, SY_THR_STATIC }, /* 544 = freebsd32_procctl */
+       { AS(freebsd32_procctl_args), (sy_call_t *)freebsd32_procctl, 
AUE_PROCCTL, NULL, 0, 0, 0, SY_THR_STATIC },      /* 544 = freebsd32_procctl */
 #endif
        { AS(freebsd32_ppoll_args), (sy_call_t *)freebsd32_ppoll, AUE_POLL, 
NULL, 0, 0, 0, SY_THR_STATIC },     /* 545 = freebsd32_ppoll */
        { AS(freebsd32_futimens_args), (sy_call_t *)freebsd32_futimens, 
AUE_FUTIMES, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },       /* 546 = 
freebsd32_futimens */

Modified: head/sys/compat/freebsd32/syscalls.master
==============================================================================
--- head/sys/compat/freebsd32/syscalls.master   Wed Mar 29 21:31:45 2017        
(r316181)
+++ head/sys/compat/freebsd32/syscalls.master   Wed Mar 29 22:33:56 2017        
(r316182)
@@ -145,7 +145,7 @@
 53     AUE_SIGALTSTACK STD     { int freebsd32_sigaltstack( \
                                    struct sigaltstack32 *ss, \
                                    struct sigaltstack32 *oss); }
-54     AUE_NULL        STD     { int freebsd32_ioctl(int fd, uint32_t com, \
+54     AUE_IOCTL       STD     { int freebsd32_ioctl(int fd, uint32_t com, \
                                    struct md_ioctl32 *data); }
 55     AUE_REBOOT      NOPROTO { int reboot(int opt); }
 56     AUE_REVOKE      NOPROTO { int revoke(char *path); }
@@ -218,7 +218,7 @@
 100    AUE_GETPRIORITY NOPROTO { int getpriority(int which, int who); }
 101    AUE_NULL        OBSOL   osend
 102    AUE_NULL        OBSOL   orecv
-103    AUE_NULL        COMPAT  { int freebsd32_sigreturn( \
+103    AUE_SIGRETURN   COMPAT  { int freebsd32_sigreturn( \
                                    struct ia32_sigcontext3 *sigcntxp); }
 104    AUE_BIND        NOPROTO { int bind(int s, caddr_t name, \
                                    int namelen); }
@@ -312,8 +312,8 @@
 160    AUE_LGETFH      UNIMPL  lgetfh
 161    AUE_NFS_GETFH   NOPROTO { int getfh(char *fname, \
                                    struct fhandle *fhp); }
-162    AUE_NULL        OBSOL   getdomainname
-163    AUE_NULL        OBSOL   setdomainname
+162    AUE_SYSCTL      OBSOL   getdomainname
+163    AUE_SYSCTL      OBSOL   setdomainname
 164    AUE_NULL        OBSOL   uname
 165    AUE_SYSARCH     STD     { int freebsd32_sysarch(int op, char *parms); }
 166    AUE_RTPRIO      NOPROTO { int rtprio(int function, pid_t pid, \
@@ -477,14 +477,14 @@
 250    AUE_MINHERIT    NOPROTO { int minherit(void *addr, size_t len, \
                                    int inherit); }
 251    AUE_RFORK       NOPROTO { int rfork(int flags); }
-252    AUE_NULL        OBSOL   openbsd_poll
+252    AUE_POLL        OBSOL   openbsd_poll
 253    AUE_ISSETUGID   NOPROTO { int issetugid(void); }
 254    AUE_LCHOWN      NOPROTO { int lchown(char *path, int uid, int gid); }
-255    AUE_NULL        STD     { int freebsd32_aio_read( \
+255    AUE_AIO_READ    STD     { int freebsd32_aio_read( \
                                    struct aiocb32 *aiocbp); }
-256    AUE_NULL        STD     { int freebsd32_aio_write( \
+256    AUE_AIO_WRITE   STD     { int freebsd32_aio_write( \
                                    struct aiocb32 *aiocbp); }
-257    AUE_NULL        STD     { int freebsd32_lio_listio(int mode, \
+257    AUE_LIO_LISTIO  STD     { int freebsd32_lio_listio(int mode, \
                                    struct aiocb32 * const *acb_list, \
                                    int nent, struct sigevent32 *sig); }
 258    AUE_NULL        UNIMPL  nosys
@@ -565,20 +565,20 @@
 312    AUE_SETRESGID   NOPROTO { int setresgid(gid_t rgid, gid_t egid, \
                                    gid_t sgid); }
 313    AUE_NULL        OBSOL   signanosleep
-314    AUE_NULL        STD     { int freebsd32_aio_return( \
+314    AUE_AIO_RETURN  STD     { int freebsd32_aio_return( \
                                    struct aiocb32 *aiocbp); }
-315    AUE_NULL        STD     { int freebsd32_aio_suspend( \
+315    AUE_AIO_SUSPEND STD     { int freebsd32_aio_suspend( \
                                    struct aiocb32 * const * aiocbp, int nent, \
                                    const struct timespec32 *timeout); }
-316    AUE_NULL        NOPROTO { int aio_cancel(int fd, \
+316    AUE_AIO_CANCEL  NOPROTO { int aio_cancel(int fd, \
                                    struct aiocb *aiocbp); }
-317    AUE_NULL        STD     { int freebsd32_aio_error( \
+317    AUE_AIO_ERROR   STD     { int freebsd32_aio_error( \
                                    struct aiocb32 *aiocbp); }
-318    AUE_NULL        COMPAT6 { int freebsd32_aio_read( \
+318    AUE_AIO_READ    COMPAT6 { int freebsd32_aio_read( \
                                    struct oaiocb32 *aiocbp); }
-319    AUE_NULL        COMPAT6 { int freebsd32_aio_write( \
+319    AUE_AIO_WRITE   COMPAT6 { int freebsd32_aio_write( \
                                    struct oaiocb32 *aiocbp); }
-320    AUE_NULL        COMPAT6 { int freebsd32_lio_listio(int mode, \
+320    AUE_LIO_LISTIO  COMPAT6 { int freebsd32_lio_listio(int mode, \
                                    struct oaiocb32 * const *acb_list, \
                                    int nent, struct osigevent32 *sig); }
 321    AUE_NULL        NOPROTO { int yield(void); }
@@ -626,21 +626,21 @@
                                    const struct timespec *timeout); }
 346    AUE_NULL        STD     { int freebsd32_sigwaitinfo(const sigset_t 
*set, \
                                    siginfo_t *info); }
-347    AUE_NULL        NOPROTO { int __acl_get_file(const char *path, \
+347    AUE_ACL_GET_FILE        NOPROTO { int __acl_get_file(const char *path, \
                                    acl_type_t type, struct acl *aclp); }
-348    AUE_NULL        NOPROTO { int __acl_set_file(const char *path, \
+348    AUE_ACL_SET_FILE        NOPROTO { int __acl_set_file(const char *path, \
                                    acl_type_t type, struct acl *aclp); }
-349    AUE_NULL        NOPROTO { int __acl_get_fd(int filedes, \
+349    AUE_ACL_GET_FD  NOPROTO { int __acl_get_fd(int filedes, \
                                    acl_type_t type, struct acl *aclp); }
-350    AUE_NULL        NOPROTO { int __acl_set_fd(int filedes, \
+350    AUE_ACL_SET_FD  NOPROTO { int __acl_set_fd(int filedes, \
                                    acl_type_t type, struct acl *aclp); }
-351    AUE_NULL        NOPROTO { int __acl_delete_file(const char *path, \
+351    AUE_ACL_DELETE_FILE     NOPROTO { int __acl_delete_file(const char 
*path, \
                                    acl_type_t type); }
-352    AUE_NULL        NOPROTO { int __acl_delete_fd(int filedes, \
+352    AUE_ACL_DELETE_FD       NOPROTO { int __acl_delete_fd(int filedes, \
                                    acl_type_t type); }
-353    AUE_NULL        NOPROTO { int __acl_aclcheck_file(const char *path, \
+353    AUE_ACL_CHECK_FILE      NOPROTO { int __acl_aclcheck_file(const char 
*path, \
                                    acl_type_t type, struct acl *aclp); }
-354    AUE_NULL        NOPROTO { int __acl_aclcheck_fd(int filedes, \
+354    AUE_ACL_CHECK_FD        NOPROTO { int __acl_aclcheck_fd(int filedes, \
                                    acl_type_t type, struct acl *aclp); }
 355    AUE_EXTATTRCTL  NOPROTO { int extattrctl(const char *path, int cmd, \
                                    const char *filename, int attrnamespace, \
@@ -656,7 +656,7 @@
 358    AUE_EXTATTR_DELETE_FILE NOPROTO { int extattr_delete_file( \
                                    const char *path, int attrnamespace, \
                                    const char *attrname); }
-359    AUE_NULL        STD     { int freebsd32_aio_waitcomplete( \
+359    AUE_AIO_WAITCOMPLETE    STD     { int freebsd32_aio_waitcomplete( \
                                    struct aiocb32 **aiocbp, \
                                    struct timespec32 *timeout); }
 360    AUE_GETRESUID   NOPROTO { int getresuid(uid_t *ruid, uid_t *euid, \
@@ -664,7 +664,7 @@
 361    AUE_GETRESGID   NOPROTO { int getresgid(gid_t *rgid, gid_t *egid, \
                                    gid_t *sgid); }
 362    AUE_KQUEUE      NOPROTO { int kqueue(void); }
-363    AUE_NULL        STD     { int freebsd32_kevent(int fd, \
+363    AUE_KEVENT      STD     { int freebsd32_kevent(int fd, \
                                    const struct kevent32 *changelist, \
                                    int nchanges, \
                                    struct kevent32 *eventlist, int nevents, \
@@ -685,7 +685,7 @@
 373    AUE_EXTATTR_DELETE_FD   NOPROTO { int extattr_delete_fd(int fd, \
                                    int attrnamespace, \
                                    const char *attrname); }
-374    AUE_NULL        NOPROTO { int __setugid(int flag); }
+374    AUE_SETUGID     NOPROTO { int __setugid(int flag); }
 375    AUE_NULL        UNIMPL  nfsclnt
 376    AUE_EACCESS     NOPROTO { int eaccess(char *path, int amode); }
 377    AUE_NULL        UNIMPL  afs_syscall
@@ -721,19 +721,19 @@
 398    AUE_FHSTATFS    NOPROTO { int fhstatfs(const struct fhandle *u_fhp, \
                                    struct statfs *buf); }
 399    AUE_NULL        UNIMPL  nosys
-400    AUE_NULL        NOSTD|NOPROTO   { int ksem_close(semid_t id); }
-401    AUE_NULL        NOSTD|NOPROTO   { int ksem_post(semid_t id); }
-402    AUE_NULL        NOSTD|NOPROTO   { int ksem_wait(semid_t id); }
-403    AUE_NULL        NOSTD|NOPROTO   { int ksem_trywait(semid_t id); }
-404    AUE_NULL        NOSTD   { int freebsd32_ksem_init(semid_t *idp, \
+400    AUE_SEMCLOSE    NOSTD|NOPROTO   { int ksem_close(semid_t id); }
+401    AUE_SEMPOST     NOSTD|NOPROTO   { int ksem_post(semid_t id); }
+402    AUE_SEMWAIT     NOSTD|NOPROTO   { int ksem_wait(semid_t id); }
+403    AUE_SEMTRYWAIT  NOSTD|NOPROTO   { int ksem_trywait(semid_t id); }
+404    AUE_SEMINIT     NOSTD   { int freebsd32_ksem_init(semid_t *idp, \
                                    unsigned int value); }
-405    AUE_NULL        NOSTD   { int freebsd32_ksem_open(semid_t *idp, \
+405    AUE_SEMOPEN     NOSTD   { int freebsd32_ksem_open(semid_t *idp, \
                                    const char *name, int oflag, \
                                    mode_t mode, unsigned int value); }
-406    AUE_NULL        NOSTD|NOPROTO   { int ksem_unlink(const char *name); }
-407    AUE_NULL        NOSTD|NOPROTO   { int ksem_getvalue(semid_t id, \
+406    AUE_SEMUNLINK   NOSTD|NOPROTO   { int ksem_unlink(const char *name); }
+407    AUE_SEMGETVALUE NOSTD|NOPROTO   { int ksem_getvalue(semid_t id, \
                                    int *val); }
-408    AUE_NULL        NOSTD|NOPROTO   { int ksem_destroy(semid_t id); }
+408    AUE_SEMDESTROY  NOSTD|NOPROTO   { int ksem_destroy(semid_t id); }
 409    AUE_NULL        UNIMPL  __mac_get_pid
 410    AUE_NULL        UNIMPL  __mac_get_link
 411    AUE_NULL        UNIMPL  __mac_set_link
@@ -765,23 +765,23 @@
                                    struct freebsd32_ucontext *oucp, \
                                    const struct freebsd32_ucontext *ucp); }
 424    AUE_SWAPOFF     UNIMPL  swapoff
-425    AUE_NULL        NOPROTO { int __acl_get_link(const char *path, \
+425    AUE_ACL_GET_LINK        NOPROTO { int __acl_get_link(const char *path, \
                                    acl_type_t type, struct acl *aclp); }
-426    AUE_NULL        NOPROTO { int __acl_set_link(const char *path, \
+426    AUE_ACL_SET_LINK        NOPROTO { int __acl_set_link(const char *path, \
                                    acl_type_t type, struct acl *aclp); }
-427    AUE_NULL        NOPROTO { int __acl_delete_link(const char *path, \
+427    AUE_ACL_DELETE_LINK     NOPROTO { int __acl_delete_link(const char 
*path, \
                                    acl_type_t type); }
-428    AUE_NULL        NOPROTO { int __acl_aclcheck_link(const char *path, \
+428    AUE_ACL_CHECK_LINK      NOPROTO { int __acl_aclcheck_link(const char 
*path, \
                                    acl_type_t type, struct acl *aclp); }
 429    AUE_SIGWAIT     NOPROTO { int sigwait(const sigset_t *set, \
                                    int *sig); }
-430    AUE_NULL        UNIMPL  thr_create;
-431    AUE_NULL        NOPROTO { void thr_exit(long *state); }
+430    AUE_THR_CREATE  UNIMPL  thr_create;
+431    AUE_THR_EXIT    NOPROTO { void thr_exit(long *state); }
 432    AUE_NULL        NOPROTO { int thr_self(long *id); }
-433    AUE_NULL        NOPROTO { int thr_kill(long id, int sig); }
+433    AUE_THR_KILL    NOPROTO { int thr_kill(long id, int sig); }
 434    AUE_NULL        UNIMPL  nosys
 435    AUE_NULL        UNIMPL  nosys
-436    AUE_NULL        NOPROTO { int jail_attach(int jid); }
+436    AUE_JAIL_ATTACH NOPROTO { int jail_attach(int jid); }
 437    AUE_EXTATTR_LIST_FD     NOPROTO { ssize_t extattr_list_fd(int fd, \
                                    int attrnamespace, void *data, \
                                    size_t nbytes); }
@@ -792,7 +792,7 @@
                                    const char *path, int attrnamespace, \
                                    void *data, size_t nbytes); }
 440    AUE_NULL        UNIMPL  kse_switchin
-441    AUE_NULL        NOSTD   { int freebsd32_ksem_timedwait(semid_t id, \
+441    AUE_SEMWAIT     NOSTD   { int freebsd32_ksem_timedwait(semid_t id, \
                                    const struct timespec32 *abstime); }
 442    AUE_NULL        STD     { int freebsd32_thr_suspend( \
                                    const struct timespec32 *timeout); }
@@ -816,31 +816,31 @@
 454    AUE_NULL        STD     { int freebsd32_umtx_op(void *obj, int op,\
                                    u_long val, void *uaddr, \
                                    void *uaddr2); }
-455    AUE_NULL        STD     { int freebsd32_thr_new(        \
+455    AUE_THR_NEW     STD     { int freebsd32_thr_new(        \
                                    struct thr_param32 *param,  \
                                    int param_size); }
 456    AUE_NULL        NOPROTO { int sigqueue(pid_t pid, int signum, \
                                    void *value); }
-457    AUE_NULL        NOSTD   { int freebsd32_kmq_open( \
+457    AUE_MQ_OPEN     NOSTD   { int freebsd32_kmq_open( \
                                    const char *path, int flags, mode_t mode, \
                                    const struct mq_attr32 *attr); }
-458    AUE_NULL        NOSTD   { int freebsd32_kmq_setattr(int mqd, \
+458    AUE_MQ_SETATTR  NOSTD   { int freebsd32_kmq_setattr(int mqd, \
                                    const struct mq_attr32 *attr,       \
                                    struct mq_attr32 *oattr); }
-459    AUE_NULL        NOSTD   { int freebsd32_kmq_timedreceive(int mqd, \
+459    AUE_MQ_TIMEDRECEIVE     NOSTD   { int freebsd32_kmq_timedreceive(int 
mqd, \
                                    char *msg_ptr, size_t msg_len,      \
                                    unsigned *msg_prio,                 \
                                    const struct timespec32 *abs_timeout); }
-460    AUE_NULL        NOSTD   { int freebsd32_kmq_timedsend(int mqd,  \
+460    AUE_MQ_TIMEDSEND        NOSTD   { int freebsd32_kmq_timedsend(int mqd,  
\
                                    const char *msg_ptr, size_t msg_len,\
                                    unsigned msg_prio,                  \
                                    const struct timespec32 *abs_timeout);}
-461    AUE_NULL        NOSTD   { int freebsd32_kmq_notify(int mqd,     \
+461    AUE_MQ_NOTIFY   NOSTD   { int freebsd32_kmq_notify(int mqd,     \
                                    const struct sigevent32 *sigev); }
-462    AUE_NULL        NOPROTO|NOSTD   { int kmq_unlink(const char *path); }
+462    AUE_MQ_UNLINK   NOPROTO|NOSTD   { int kmq_unlink(const char *path); }
 463    AUE_NULL        NOPROTO { int abort2(const char *why, int nargs, void 
**args); }
 464    AUE_NULL        NOPROTO { int thr_set_name(long id, const char *name); }
-465    AUE_NULL        STD     { int freebsd32_aio_fsync(int op, \
+465    AUE_AIO_FSYNC   STD     { int freebsd32_aio_fsync(int op, \
                                    struct aiocb32 *aiocbp); }
 466    AUE_RTPRIO      NOPROTO { int rtprio_thread(int function, \
                                    lwpid_t lwpid, struct rtprio *rtp); }
@@ -848,14 +848,14 @@
 468    AUE_NULL        UNIMPL  nosys
 469    AUE_NULL        UNIMPL  __getpath_fromfd
 470    AUE_NULL        UNIMPL  __getpath_fromaddr
-471    AUE_NULL        NOPROTO|NOSTD   { int sctp_peeloff(int sd, uint32_t 
name); }
-472    AUE_NULL        NOPROTO|NOSTD   { int sctp_generic_sendmsg(int sd, 
caddr_t msg, int mlen, \
+471    AUE_SCTP_PEELOFF        NOPROTO|NOSTD   { int sctp_peeloff(int sd, 
uint32_t name); }
+472    AUE_SCTP_GENERIC_SENDMSG        NOPROTO|NOSTD   { int 
sctp_generic_sendmsg(int sd, caddr_t msg, int mlen, \
                                    caddr_t to, __socklen_t tolen, \
                                    struct sctp_sndrcvinfo *sinfo, int flags); }
-473    AUE_NULL        NOPROTO|NOSTD   { int sctp_generic_sendmsg_iov(int sd, 
struct iovec *iov, int iovlen, \
+473    AUE_SCTP_GENERIC_SENDMSG_IOV    NOPROTO|NOSTD   { int 
sctp_generic_sendmsg_iov(int sd, struct iovec *iov, int iovlen, \
                                    caddr_t to, __socklen_t tolen, \
                                    struct sctp_sndrcvinfo *sinfo, int flags); }
-474    AUE_NULL        NOPROTO|NOSTD   { int sctp_generic_recvmsg(int sd, 
struct iovec *iov, int iovlen, \
+474    AUE_SCTP_GENERIC_RECVMSG        NOPROTO|NOSTD   { int 
sctp_generic_recvmsg(int sd, struct iovec *iov, int iovlen, \
                                    struct sockaddr * from, __socklen_t 
*fromlenaddr, \
                                    struct sctp_sndrcvinfo *sinfo, int 
*msg_flags); }
 #ifdef PAD64_REQUIRED
@@ -899,7 +899,7 @@
 480    AUE_FTRUNCATE   STD     { int freebsd32_ftruncate(int fd, \
                                    uint32_t length1, uint32_t length2); }
 #endif
-481    AUE_KILL        NOPROTO { int thr_kill2(pid_t pid, long id, int sig); }
+481    AUE_THR_KILL2   NOPROTO { int thr_kill2(pid_t pid, long id, int sig); }
 482    AUE_SHMOPEN     NOPROTO { int shm_open(const char *path, int flags, \
                                    mode_t mode); }
 483    AUE_SHMUNLINK   NOPROTO { int shm_unlink(const char *path); }
@@ -961,11 +961,11 @@
 504    AUE_POSIX_OPENPT        NOPROTO { int posix_openpt(int flags); }
 ; 505 is initialised by the kgssapi code, if present.
 505    AUE_NULL        UNIMPL  gssd_syscall
-506    AUE_NULL        STD     { int freebsd32_jail_get(struct iovec32 *iovp, \
+506    AUE_JAIL_GET    STD     { int freebsd32_jail_get(struct iovec32 *iovp, \
                                    unsigned int iovcnt, int flags); }
-507    AUE_NULL        STD     { int freebsd32_jail_set(struct iovec32 *iovp, \
+507    AUE_JAIL_SET    STD     { int freebsd32_jail_set(struct iovec32 *iovp, \
                                    unsigned int iovcnt, int flags); }
-508    AUE_NULL        NOPROTO { int jail_remove(int jid); }
+508    AUE_JAIL_REMOVE NOPROTO { int jail_remove(int jid); }
 509    AUE_CLOSEFROM   NOPROTO { int closefrom(int lowfd); }
 510    AUE_SEMCTL      NOSTD { int freebsd32_semctl(int semid, int semnum, \
                                    int cmd, union semun32 *arg); }
@@ -987,9 +987,9 @@
                                    fd_set *ou, fd_set *ex, \
                                    const struct timespec32 *ts, \
                                    const sigset_t *sm); }
-523    AUE_NULL        NOPROTO { int getloginclass(char *namebuf, \
+523    AUE_GETLOGINCLASS       NOPROTO { int getloginclass(char *namebuf, \
                                    size_t namelen); }
-524    AUE_NULL        NOPROTO { int setloginclass(const char *namebuf); }
+524    AUE_SETLOGINCLASS       NOPROTO { int setloginclass(const char 
*namebuf); }
 525    AUE_NULL        NOPROTO { int rctl_get_racct(const void *inbufp, \
                                    size_t inbuflen, void *outbufp, \
                                    size_t outbuflen); }
@@ -1006,11 +1006,11 @@
                                    size_t inbuflen, void *outbufp, \
                                    size_t outbuflen); }
 #ifdef PAD64_REQUIRED
-530    AUE_NULL        STD     { int freebsd32_posix_fallocate(int fd, \
+530    AUE_POSIX_FALLOCATE     STD     { int freebsd32_posix_fallocate(int fd, 
\
                                    int pad, \
                                    uint32_t offset1, uint32_t offset2,\
                                    uint32_t len1, uint32_t len2); }
-531    AUE_NULL        STD     { int freebsd32_posix_fadvise(int fd, \
+531    AUE_POSIX_FADVISE       STD     { int freebsd32_posix_fadvise(int fd, \
                                    int pad, \
                                    uint32_t offset1, uint32_t offset2,\
                                    uint32_t len1, uint32_t len2, \
@@ -1021,10 +1021,10 @@
                                    struct wrusage32 *wrusage, \
                                    siginfo_t *info); }
 #else
-530    AUE_NULL        STD     { int freebsd32_posix_fallocate(int fd,\
+530    AUE_POSIX_FALLOCATE     STD     { int freebsd32_posix_fallocate(int fd,\
                                    uint32_t offset1, uint32_t offset2,\
                                    uint32_t len1, uint32_t len2); }
-531    AUE_NULL        STD     { int freebsd32_posix_fadvise(int fd, \
+531    AUE_POSIX_FADVISE       STD     { int freebsd32_posix_fadvise(int fd, \
                                    uint32_t offset1, uint32_t offset2,\
                                    uint32_t len1, uint32_t len2, \
                                    int advice); }
@@ -1058,14 +1058,14 @@
                                    __socklen_t * __restrict anamelen, \
                                    int flags); }
 542    AUE_PIPE        NOPROTO { int pipe2(int *fildes, int flags); }
-543    AUE_NULL        STD     { int freebsd32_aio_mlock( \
+543    AUE_AIO_MLOCK   STD     { int freebsd32_aio_mlock( \
                                    struct aiocb32 *aiocbp); }
 #ifdef PAD64_REQUIRED
-544    AUE_NULL        STD     { int freebsd32_procctl(int idtype, int pad, \
+544    AUE_PROCCTL     STD     { int freebsd32_procctl(int idtype, int pad, \
                                    uint32_t id1, uint32_t id2, int com, \
                                    void *data); }
 #else
-544    AUE_NULL        STD     { int freebsd32_procctl(int idtype, \
+544    AUE_PROCCTL     STD     { int freebsd32_procctl(int idtype, \
                                    uint32_t id1, uint32_t id2, int com, \
                                    void *data); }
 #endif

Modified: head/sys/kern/init_sysent.c
==============================================================================
--- head/sys/kern/init_sysent.c Wed Mar 29 21:31:45 2017        (r316181)
+++ head/sys/kern/init_sysent.c Wed Mar 29 22:33:56 2017        (r316182)
@@ -220,7 +220,7 @@ struct sysent sysent[] = {
        { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },      
                /* 172 = nosys */
        { compat6(AS(freebsd6_pread_args),pread), AUE_PREAD, NULL, 0, 0, 
SYF_CAPENABLED, SY_THR_STATIC },       /* 173 = freebsd6 pread */
        { compat6(AS(freebsd6_pwrite_args),pwrite), AUE_PWRITE, NULL, 0, 0, 
SYF_CAPENABLED, SY_THR_STATIC },    /* 174 = freebsd6 pwrite */
-       { AS(setfib_args), (sy_call_t *)sys_setfib, AUE_NULL, NULL, 0, 0, 0, 
SY_THR_STATIC },   /* 175 = setfib */
+       { AS(setfib_args), (sy_call_t *)sys_setfib, AUE_SETFIB, NULL, 0, 0, 0, 
SY_THR_STATIC }, /* 175 = setfib */
        { AS(ntp_adjtime_args), (sy_call_t *)sys_ntp_adjtime, AUE_NTP_ADJTIME, 
NULL, 0, 0, 0, SY_THR_STATIC },  /* 176 = ntp_adjtime */
        { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },      
                /* 177 = sfork */
        { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },      
                /* 178 = getdescriptor */
@@ -300,9 +300,9 @@ struct sysent sysent[] = {
        { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },      
                /* 252 = obsolete openbsd_poll */
        { 0, (sy_call_t *)sys_issetugid, AUE_ISSETUGID, NULL, 0, 0, 
SYF_CAPENABLED, SY_THR_STATIC },    /* 253 = issetugid */
        { AS(lchown_args), (sy_call_t *)sys_lchown, AUE_LCHOWN, NULL, 0, 0, 0, 
SY_THR_STATIC }, /* 254 = lchown */
-       { AS(aio_read_args), (sy_call_t *)sys_aio_read, AUE_NULL, NULL, 0, 0, 
SYF_CAPENABLED, SY_THR_STATIC },  /* 255 = aio_read */
-       { AS(aio_write_args), (sy_call_t *)sys_aio_write, AUE_NULL, NULL, 0, 0, 
SYF_CAPENABLED, SY_THR_STATIC },        /* 256 = aio_write */
-       { AS(lio_listio_args), (sy_call_t *)sys_lio_listio, AUE_NULL, NULL, 0, 
0, SYF_CAPENABLED, SY_THR_STATIC },      /* 257 = lio_listio */
+       { AS(aio_read_args), (sy_call_t *)sys_aio_read, AUE_AIO_READ, NULL, 0, 
0, SYF_CAPENABLED, SY_THR_STATIC },      /* 255 = aio_read */
+       { AS(aio_write_args), (sy_call_t *)sys_aio_write, AUE_AIO_WRITE, NULL, 
0, 0, SYF_CAPENABLED, SY_THR_STATIC },   /* 256 = aio_write */
+       { AS(lio_listio_args), (sy_call_t *)sys_lio_listio, AUE_LIO_LISTIO, 
NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },        /* 257 = lio_listio */
        { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },      
                /* 258 = nosys */
        { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },      
                /* 259 = nosys */
        { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },      
                /* 260 = nosys */
@@ -359,13 +359,13 @@ struct sysent sysent[] = {
        { AS(setresuid_args), (sy_call_t *)sys_setresuid, AUE_SETRESUID, NULL, 
0, 0, SYF_CAPENABLED, SY_THR_STATIC },   /* 311 = setresuid */
        { AS(setresgid_args), (sy_call_t *)sys_setresgid, AUE_SETRESGID, NULL, 
0, 0, SYF_CAPENABLED, SY_THR_STATIC },   /* 312 = setresgid */
        { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },      
                /* 313 = obsolete signanosleep */
-       { AS(aio_return_args), (sy_call_t *)sys_aio_return, AUE_NULL, NULL, 0, 
0, SYF_CAPENABLED, SY_THR_STATIC },      /* 314 = aio_return */
-       { AS(aio_suspend_args), (sy_call_t *)sys_aio_suspend, AUE_NULL, NULL, 
0, 0, SYF_CAPENABLED, SY_THR_STATIC },    /* 315 = aio_suspend */
-       { AS(aio_cancel_args), (sy_call_t *)sys_aio_cancel, AUE_NULL, NULL, 0, 
0, SYF_CAPENABLED, SY_THR_STATIC },      /* 316 = aio_cancel */
-       { AS(aio_error_args), (sy_call_t *)sys_aio_error, AUE_NULL, NULL, 0, 0, 
SYF_CAPENABLED, SY_THR_STATIC },        /* 317 = aio_error */
-       { compat6(AS(freebsd6_aio_read_args),aio_read), AUE_NULL, NULL, 0, 0, 
SYF_CAPENABLED, SY_THR_STATIC },  /* 318 = freebsd6 aio_read */
-       { compat6(AS(freebsd6_aio_write_args),aio_write), AUE_NULL, NULL, 0, 0, 
SYF_CAPENABLED, SY_THR_STATIC },        /* 319 = freebsd6 aio_write */
-       { compat6(AS(freebsd6_lio_listio_args),lio_listio), AUE_NULL, NULL, 0, 
0, SYF_CAPENABLED, SY_THR_STATIC },      /* 320 = freebsd6 lio_listio */
+       { AS(aio_return_args), (sy_call_t *)sys_aio_return, AUE_AIO_RETURN, 
NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },        /* 314 = aio_return */
+       { AS(aio_suspend_args), (sy_call_t *)sys_aio_suspend, AUE_AIO_SUSPEND, 
NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },     /* 315 = aio_suspend */
+       { AS(aio_cancel_args), (sy_call_t *)sys_aio_cancel, AUE_AIO_CANCEL, 
NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },        /* 316 = aio_cancel */
+       { AS(aio_error_args), (sy_call_t *)sys_aio_error, AUE_AIO_ERROR, NULL, 
0, 0, SYF_CAPENABLED, SY_THR_STATIC },   /* 317 = aio_error */
+       { compat6(AS(freebsd6_aio_read_args),aio_read), AUE_AIO_READ, NULL, 0, 
0, SYF_CAPENABLED, SY_THR_STATIC },      /* 318 = freebsd6 aio_read */
+       { compat6(AS(freebsd6_aio_write_args),aio_write), AUE_AIO_WRITE, NULL, 
0, 0, SYF_CAPENABLED, SY_THR_STATIC },   /* 319 = freebsd6 aio_write */
+       { compat6(AS(freebsd6_lio_listio_args),lio_listio), AUE_LIO_LISTIO, 
NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },        /* 320 = freebsd6 
lio_listio */
        { 0, (sy_call_t *)sys_yield, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, 
SY_THR_STATIC },     /* 321 = yield */
        { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },      
                /* 322 = obsolete thr_sleep */
        { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },      
                /* 323 = obsolete thr_wakeup */
@@ -392,23 +392,23 @@ struct sysent sysent[] = {
        { compat4(AS(freebsd4_sigreturn_args),sigreturn), AUE_SIGRETURN, NULL, 
0, 0, SYF_CAPENABLED, SY_THR_STATIC },   /* 344 = freebsd4 sigreturn */
        { AS(sigtimedwait_args), (sy_call_t *)sys_sigtimedwait, AUE_SIGWAIT, 
NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },       /* 345 = sigtimedwait */
        { AS(sigwaitinfo_args), (sy_call_t *)sys_sigwaitinfo, AUE_NULL, NULL, 
0, 0, SYF_CAPENABLED, SY_THR_STATIC },    /* 346 = sigwaitinfo */
-       { AS(__acl_get_file_args), (sy_call_t *)sys___acl_get_file, AUE_NULL, 
NULL, 0, 0, 0, SY_THR_STATIC },   /* 347 = __acl_get_file */
-       { AS(__acl_set_file_args), (sy_call_t *)sys___acl_set_file, AUE_NULL, 
NULL, 0, 0, 0, SY_THR_STATIC },   /* 348 = __acl_set_file */
-       { AS(__acl_get_fd_args), (sy_call_t *)sys___acl_get_fd, AUE_NULL, NULL, 
0, 0, SYF_CAPENABLED, SY_THR_STATIC },  /* 349 = __acl_get_fd */
-       { AS(__acl_set_fd_args), (sy_call_t *)sys___acl_set_fd, AUE_NULL, NULL, 
0, 0, SYF_CAPENABLED, SY_THR_STATIC },  /* 350 = __acl_set_fd */
-       { AS(__acl_delete_file_args), (sy_call_t *)sys___acl_delete_file, 
AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },     /* 351 = __acl_delete_file */
-       { AS(__acl_delete_fd_args), (sy_call_t *)sys___acl_delete_fd, AUE_NULL, 
NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },    /* 352 = __acl_delete_fd */
-       { AS(__acl_aclcheck_file_args), (sy_call_t *)sys___acl_aclcheck_file, 
AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 353 = __acl_aclcheck_file */
-       { AS(__acl_aclcheck_fd_args), (sy_call_t *)sys___acl_aclcheck_fd, 
AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },        /* 354 = 
__acl_aclcheck_fd */
+       { AS(__acl_get_file_args), (sy_call_t *)sys___acl_get_file, 
AUE_ACL_GET_FILE, NULL, 0, 0, 0, SY_THR_STATIC },   /* 347 = __acl_get_file */
+       { AS(__acl_set_file_args), (sy_call_t *)sys___acl_set_file, 
AUE_ACL_SET_FILE, NULL, 0, 0, 0, SY_THR_STATIC },   /* 348 = __acl_set_file */
+       { AS(__acl_get_fd_args), (sy_call_t *)sys___acl_get_fd, AUE_ACL_GET_FD, 
NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },    /* 349 = __acl_get_fd */
+       { AS(__acl_set_fd_args), (sy_call_t *)sys___acl_set_fd, AUE_ACL_SET_FD, 
NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },    /* 350 = __acl_set_fd */
+       { AS(__acl_delete_file_args), (sy_call_t *)sys___acl_delete_file, 
AUE_ACL_DELETE_FILE, NULL, 0, 0, 0, SY_THR_STATIC },  /* 351 = 
__acl_delete_file */
+       { AS(__acl_delete_fd_args), (sy_call_t *)sys___acl_delete_fd, 
AUE_ACL_DELETE_FD, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },   /* 352 = 
__acl_delete_fd */
+       { AS(__acl_aclcheck_file_args), (sy_call_t *)sys___acl_aclcheck_file, 
AUE_ACL_CHECK_FILE, NULL, 0, 0, 0, SY_THR_STATIC },       /* 353 = 
__acl_aclcheck_file */
+       { AS(__acl_aclcheck_fd_args), (sy_call_t *)sys___acl_aclcheck_fd, 
AUE_ACL_CHECK_FD, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },        /* 354 = 
__acl_aclcheck_fd */
        { AS(extattrctl_args), (sy_call_t *)sys_extattrctl, AUE_EXTATTRCTL, 
NULL, 0, 0, 0, SY_THR_STATIC },     /* 355 = extattrctl */
        { AS(extattr_set_file_args), (sy_call_t *)sys_extattr_set_file, 
AUE_EXTATTR_SET_FILE, NULL, 0, 0, 0, SY_THR_STATIC },   /* 356 = 
extattr_set_file */
        { AS(extattr_get_file_args), (sy_call_t *)sys_extattr_get_file, 
AUE_EXTATTR_GET_FILE, NULL, 0, 0, 0, SY_THR_STATIC },   /* 357 = 
extattr_get_file */
        { AS(extattr_delete_file_args), (sy_call_t *)sys_extattr_delete_file, 
AUE_EXTATTR_DELETE_FILE, NULL, 0, 0, 0, SY_THR_STATIC },  /* 358 = 
extattr_delete_file */
-       { AS(aio_waitcomplete_args), (sy_call_t *)sys_aio_waitcomplete, 
AUE_NULL, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },  /* 359 = 
aio_waitcomplete */
+       { AS(aio_waitcomplete_args), (sy_call_t *)sys_aio_waitcomplete, 
AUE_AIO_WAITCOMPLETE, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },      /* 359 
= aio_waitcomplete */
        { AS(getresuid_args), (sy_call_t *)sys_getresuid, AUE_GETRESUID, NULL, 
0, 0, SYF_CAPENABLED, SY_THR_STATIC },   /* 360 = getresuid */
        { AS(getresgid_args), (sy_call_t *)sys_getresgid, AUE_GETRESGID, NULL, 
0, 0, SYF_CAPENABLED, SY_THR_STATIC },   /* 361 = getresgid */
        { 0, (sy_call_t *)sys_kqueue, AUE_KQUEUE, NULL, 0, 0, SYF_CAPENABLED, 
SY_THR_STATIC },  /* 362 = kqueue */
-       { AS(kevent_args), (sy_call_t *)sys_kevent, AUE_NULL, NULL, 0, 0, 
SYF_CAPENABLED, SY_THR_STATIC },      /* 363 = kevent */
+       { AS(kevent_args), (sy_call_t *)sys_kevent, AUE_KEVENT, NULL, 0, 0, 
SYF_CAPENABLED, SY_THR_STATIC },    /* 363 = kevent */
        { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },      
                /* 364 = __cap_get_proc */
        { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },      
                /* 365 = __cap_set_proc */
        { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },      
                /* 366 = __cap_get_fd */
@@ -419,7 +419,7 @@ struct sysent sysent[] = {
        { AS(extattr_set_fd_args), (sy_call_t *)sys_extattr_set_fd, 
AUE_EXTATTR_SET_FD, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },    /* 371 = 
extattr_set_fd */
        { AS(extattr_get_fd_args), (sy_call_t *)sys_extattr_get_fd, 
AUE_EXTATTR_GET_FD, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },    /* 372 = 
extattr_get_fd */
        { AS(extattr_delete_fd_args), (sy_call_t *)sys_extattr_delete_fd, 
AUE_EXTATTR_DELETE_FD, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },   /* 373 = 
extattr_delete_fd */
-       { AS(__setugid_args), (sy_call_t *)sys___setugid, AUE_NULL, NULL, 0, 0, 
0, SY_THR_STATIC },     /* 374 = __setugid */
+       { AS(__setugid_args), (sy_call_t *)sys___setugid, AUE_SETUGID, NULL, 0, 
0, 0, SY_THR_STATIC },  /* 374 = __setugid */
        { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },      
                /* 375 = nfsclnt */
        { AS(eaccess_args), (sy_call_t *)sys_eaccess, AUE_EACCESS, NULL, 0, 0, 
0, SY_THR_STATIC },      /* 376 = eaccess */
        { AS(afs3_syscall_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 
0, SY_THR_ABSENT },      /* 377 = afs3_syscall */
@@ -470,18 +470,18 @@ struct sysent sysent[] = {
        { AS(setcontext_args), (sy_call_t *)sys_setcontext, AUE_NULL, NULL, 0, 
0, SYF_CAPENABLED, SY_THR_STATIC },      /* 422 = setcontext */
        { AS(swapcontext_args), (sy_call_t *)sys_swapcontext, AUE_NULL, NULL, 
0, 0, 0, SY_THR_STATIC }, /* 423 = swapcontext */
        { AS(swapoff_args), (sy_call_t *)sys_swapoff, AUE_SWAPOFF, NULL, 0, 0, 
0, SY_THR_STATIC },      /* 424 = swapoff */
-       { AS(__acl_get_link_args), (sy_call_t *)sys___acl_get_link, AUE_NULL, 
NULL, 0, 0, 0, SY_THR_STATIC },   /* 425 = __acl_get_link */
-       { AS(__acl_set_link_args), (sy_call_t *)sys___acl_set_link, AUE_NULL, 
NULL, 0, 0, 0, SY_THR_STATIC },   /* 426 = __acl_set_link */
-       { AS(__acl_delete_link_args), (sy_call_t *)sys___acl_delete_link, 
AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },     /* 427 = __acl_delete_link */
-       { AS(__acl_aclcheck_link_args), (sy_call_t *)sys___acl_aclcheck_link, 
AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 428 = __acl_aclcheck_link */
+       { AS(__acl_get_link_args), (sy_call_t *)sys___acl_get_link, 
AUE_ACL_GET_LINK, NULL, 0, 0, 0, SY_THR_STATIC },   /* 425 = __acl_get_link */
+       { AS(__acl_set_link_args), (sy_call_t *)sys___acl_set_link, 
AUE_ACL_SET_LINK, NULL, 0, 0, 0, SY_THR_STATIC },   /* 426 = __acl_set_link */
+       { AS(__acl_delete_link_args), (sy_call_t *)sys___acl_delete_link, 
AUE_ACL_DELETE_LINK, NULL, 0, 0, 0, SY_THR_STATIC },  /* 427 = 
__acl_delete_link */
+       { AS(__acl_aclcheck_link_args), (sy_call_t *)sys___acl_aclcheck_link, 
AUE_ACL_CHECK_LINK, NULL, 0, 0, 0, SY_THR_STATIC },       /* 428 = 
__acl_aclcheck_link */
        { AS(sigwait_args), (sy_call_t *)sys_sigwait, AUE_SIGWAIT, NULL, 0, 0, 
SYF_CAPENABLED, SY_THR_STATIC }, /* 429 = sigwait */
-       { AS(thr_create_args), (sy_call_t *)sys_thr_create, AUE_NULL, NULL, 0, 
0, SYF_CAPENABLED, SY_THR_STATIC },      /* 430 = thr_create */
-       { AS(thr_exit_args), (sy_call_t *)sys_thr_exit, AUE_NULL, NULL, 0, 0, 
SYF_CAPENABLED, SY_THR_STATIC },  /* 431 = thr_exit */
+       { AS(thr_create_args), (sy_call_t *)sys_thr_create, AUE_THR_CREATE, 
NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },        /* 430 = thr_create */
+       { AS(thr_exit_args), (sy_call_t *)sys_thr_exit, AUE_THR_EXIT, NULL, 0, 
0, SYF_CAPENABLED, SY_THR_STATIC },      /* 431 = thr_exit */
        { AS(thr_self_args), (sy_call_t *)sys_thr_self, AUE_NULL, NULL, 0, 0, 
SYF_CAPENABLED, SY_THR_STATIC },  /* 432 = thr_self */
-       { AS(thr_kill_args), (sy_call_t *)sys_thr_kill, AUE_NULL, NULL, 0, 0, 
SYF_CAPENABLED, SY_THR_STATIC },  /* 433 = thr_kill */
+       { AS(thr_kill_args), (sy_call_t *)sys_thr_kill, AUE_THR_KILL, NULL, 0, 
0, SYF_CAPENABLED, SY_THR_STATIC },      /* 433 = thr_kill */
        { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },      
                /* 434 = nosys */
        { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },      
                /* 435 = nosys */
-       { AS(jail_attach_args), (sy_call_t *)sys_jail_attach, AUE_NULL, NULL, 
0, 0, 0, SY_THR_STATIC }, /* 436 = jail_attach */
+       { AS(jail_attach_args), (sy_call_t *)sys_jail_attach, AUE_JAIL_ATTACH, 
NULL, 0, 0, 0, SY_THR_STATIC },  /* 436 = jail_attach */
        { AS(extattr_list_fd_args), (sy_call_t *)sys_extattr_list_fd, 
AUE_EXTATTR_LIST_FD, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 437 = 
extattr_list_fd */
        { AS(extattr_list_file_args), (sy_call_t *)sys_extattr_list_file, 
AUE_EXTATTR_LIST_FILE, NULL, 0, 0, 0, SY_THR_STATIC },        /* 438 = 
extattr_list_file */
        { AS(extattr_list_link_args), (sy_call_t *)sys_extattr_list_link, 
AUE_EXTATTR_LIST_LINK, NULL, 0, 0, 0, SY_THR_STATIC },        /* 439 = 
extattr_list_link */
@@ -500,7 +500,7 @@ struct sysent sysent[] = {
        { AS(setaudit_addr_args), (sy_call_t *)sys_setaudit_addr, 
AUE_SETAUDIT_ADDR, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },       /* 452 = 
setaudit_addr */
        { AS(auditctl_args), (sy_call_t *)sys_auditctl, AUE_AUDITCTL, NULL, 0, 
0, 0, SY_THR_STATIC },   /* 453 = auditctl */
        { AS(_umtx_op_args), (sy_call_t *)sys__umtx_op, AUE_NULL, NULL, 0, 0, 
SYF_CAPENABLED, SY_THR_STATIC },  /* 454 = _umtx_op */
-       { AS(thr_new_args), (sy_call_t *)sys_thr_new, AUE_NULL, NULL, 0, 0, 
SYF_CAPENABLED, SY_THR_STATIC },    /* 455 = thr_new */
+       { AS(thr_new_args), (sy_call_t *)sys_thr_new, AUE_THR_NEW, NULL, 0, 0, 
SYF_CAPENABLED, SY_THR_STATIC }, /* 455 = thr_new */
        { AS(sigqueue_args), (sy_call_t *)sys_sigqueue, AUE_NULL, NULL, 0, 0, 
SYF_CAPENABLED, SY_THR_STATIC },  /* 456 = sigqueue */
        { AS(kmq_open_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0, 
SY_THR_ABSENT },  /* 457 = kmq_open */
        { AS(kmq_setattr_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 
SYF_CAPENABLED, SY_THR_ABSENT },  /* 458 = kmq_setattr */
@@ -510,7 +510,7 @@ struct sysent sysent[] = {
        { AS(kmq_unlink_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0, 
SY_THR_ABSENT },        /* 462 = kmq_unlink */
        { AS(abort2_args), (sy_call_t *)sys_abort2, AUE_NULL, NULL, 0, 0, 
SYF_CAPENABLED, SY_THR_STATIC },      /* 463 = abort2 */
        { AS(thr_set_name_args), (sy_call_t *)sys_thr_set_name, AUE_NULL, NULL, 
0, 0, SYF_CAPENABLED, SY_THR_STATIC },  /* 464 = thr_set_name */
-       { AS(aio_fsync_args), (sy_call_t *)sys_aio_fsync, AUE_NULL, NULL, 0, 0, 
SYF_CAPENABLED, SY_THR_STATIC },        /* 465 = aio_fsync */
+       { AS(aio_fsync_args), (sy_call_t *)sys_aio_fsync, AUE_AIO_FSYNC, NULL, 
0, 0, SYF_CAPENABLED, SY_THR_STATIC },   /* 465 = aio_fsync */
        { AS(rtprio_thread_args), (sy_call_t *)sys_rtprio_thread, AUE_RTPRIO, 
NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },      /* 466 = rtprio_thread */
        { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },      
                /* 467 = nosys */
        { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },      
                /* 468 = nosys */
@@ -526,7 +526,7 @@ struct sysent sysent[] = {
        { AS(lseek_args), (sy_call_t *)sys_lseek, AUE_LSEEK, NULL, 0, 0, 
SYF_CAPENABLED, SY_THR_STATIC },       /* 478 = lseek */
        { AS(truncate_args), (sy_call_t *)sys_truncate, AUE_TRUNCATE, NULL, 0, 
0, 0, SY_THR_STATIC },   /* 479 = truncate */
        { AS(ftruncate_args), (sy_call_t *)sys_ftruncate, AUE_FTRUNCATE, NULL, 
0, 0, SYF_CAPENABLED, SY_THR_STATIC },   /* 480 = ftruncate */
-       { AS(thr_kill2_args), (sy_call_t *)sys_thr_kill2, AUE_KILL, NULL, 0, 0, 
0, SY_THR_STATIC },     /* 481 = thr_kill2 */
+       { AS(thr_kill2_args), (sy_call_t *)sys_thr_kill2, AUE_THR_KILL2, NULL, 
0, 0, 0, SY_THR_STATIC },        /* 481 = thr_kill2 */
        { AS(shm_open_args), (sy_call_t *)sys_shm_open, AUE_SHMOPEN, NULL, 0, 
0, SYF_CAPENABLED, SY_THR_STATIC },       /* 482 = shm_open */
        { AS(shm_unlink_args), (sy_call_t *)sys_shm_unlink, AUE_SHMUNLINK, 
NULL, 0, 0, 0, SY_THR_STATIC },      /* 483 = shm_unlink */
        { AS(cpuset_args), (sy_call_t *)sys_cpuset, AUE_NULL, NULL, 0, 0, 0, 
SY_THR_STATIC },   /* 484 = cpuset */
@@ -551,9 +551,9 @@ struct sysent sysent[] = {
        { AS(unlinkat_args), (sy_call_t *)sys_unlinkat, AUE_UNLINKAT, NULL, 0, 
0, SYF_CAPENABLED, SY_THR_STATIC },      /* 503 = unlinkat */
        { AS(posix_openpt_args), (sy_call_t *)sys_posix_openpt, 
AUE_POSIX_OPENPT, NULL, 0, 0, 0, SY_THR_STATIC },       /* 504 = posix_openpt */
        { AS(gssd_syscall_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 
0, SY_THR_ABSENT },      /* 505 = gssd_syscall */
-       { AS(jail_get_args), (sy_call_t *)sys_jail_get, AUE_NULL, NULL, 0, 0, 
0, SY_THR_STATIC },       /* 506 = jail_get */
-       { AS(jail_set_args), (sy_call_t *)sys_jail_set, AUE_NULL, NULL, 0, 0, 
0, SY_THR_STATIC },       /* 507 = jail_set */
-       { AS(jail_remove_args), (sy_call_t *)sys_jail_remove, AUE_NULL, NULL, 
0, 0, 0, SY_THR_STATIC }, /* 508 = jail_remove */
+       { AS(jail_get_args), (sy_call_t *)sys_jail_get, AUE_JAIL_GET, NULL, 0, 
0, 0, SY_THR_STATIC },   /* 506 = jail_get */
+       { AS(jail_set_args), (sy_call_t *)sys_jail_set, AUE_JAIL_SET, NULL, 0, 
0, 0, SY_THR_STATIC },   /* 507 = jail_set */
+       { AS(jail_remove_args), (sy_call_t *)sys_jail_remove, AUE_JAIL_REMOVE, 
NULL, 0, 0, 0, SY_THR_STATIC },  /* 508 = jail_remove */
        { AS(closefrom_args), (sy_call_t *)sys_closefrom, AUE_CLOSEFROM, NULL, 
0, 0, SYF_CAPENABLED, SY_THR_STATIC },   /* 509 = closefrom */
        { AS(__semctl_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0, 
SY_THR_ABSENT },  /* 510 = __semctl */
        { AS(msgctl_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0, 
SY_THR_ABSENT },    /* 511 = msgctl */
@@ -568,15 +568,15 @@ struct sysent sysent[] = {
        { AS(pdgetpid_args), (sy_call_t *)sys_pdgetpid, AUE_PDGETPID, NULL, 0, 
0, SYF_CAPENABLED, SY_THR_STATIC },      /* 520 = pdgetpid */
        { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },      
                /* 521 = pdwait4 */
        { AS(pselect_args), (sy_call_t *)sys_pselect, AUE_SELECT, NULL, 0, 0, 
SYF_CAPENABLED, SY_THR_STATIC },  /* 522 = pselect */
-       { AS(getloginclass_args), (sy_call_t *)sys_getloginclass, AUE_NULL, 
NULL, 0, 0, 0, SY_THR_STATIC },     /* 523 = getloginclass */
-       { AS(setloginclass_args), (sy_call_t *)sys_setloginclass, AUE_NULL, 
NULL, 0, 0, 0, SY_THR_STATIC },     /* 524 = setloginclass */
+       { AS(getloginclass_args), (sy_call_t *)sys_getloginclass, 
AUE_GETLOGINCLASS, NULL, 0, 0, 0, SY_THR_STATIC },    /* 523 = getloginclass */
+       { AS(setloginclass_args), (sy_call_t *)sys_setloginclass, 
AUE_SETLOGINCLASS, NULL, 0, 0, 0, SY_THR_STATIC },    /* 524 = setloginclass */
        { AS(rctl_get_racct_args), (sy_call_t *)sys_rctl_get_racct, AUE_NULL, 
NULL, 0, 0, 0, SY_THR_STATIC },   /* 525 = rctl_get_racct */
        { AS(rctl_get_rules_args), (sy_call_t *)sys_rctl_get_rules, AUE_NULL, 
NULL, 0, 0, 0, SY_THR_STATIC },   /* 526 = rctl_get_rules */
        { AS(rctl_get_limits_args), (sy_call_t *)sys_rctl_get_limits, AUE_NULL, 
NULL, 0, 0, 0, SY_THR_STATIC }, /* 527 = rctl_get_limits */
        { AS(rctl_add_rule_args), (sy_call_t *)sys_rctl_add_rule, AUE_NULL, 
NULL, 0, 0, 0, SY_THR_STATIC },     /* 528 = rctl_add_rule */
        { AS(rctl_remove_rule_args), (sy_call_t *)sys_rctl_remove_rule, 
AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },       /* 529 = rctl_remove_rule */
-       { AS(posix_fallocate_args), (sy_call_t *)sys_posix_fallocate, AUE_NULL, 
NULL, 0, 0, 0, SY_THR_STATIC }, /* 530 = posix_fallocate */
-       { AS(posix_fadvise_args), (sy_call_t *)sys_posix_fadvise, AUE_NULL, 
NULL, 0, 0, 0, SY_THR_STATIC },     /* 531 = posix_fadvise */
+       { AS(posix_fallocate_args), (sy_call_t *)sys_posix_fallocate, 
AUE_POSIX_FALLOCATE, NULL, 0, 0, 0, SY_THR_STATIC },      /* 530 = 
posix_fallocate */
+       { AS(posix_fadvise_args), (sy_call_t *)sys_posix_fadvise, 
AUE_POSIX_FADVISE, NULL, 0, 0, 0, SY_THR_STATIC },    /* 531 = posix_fadvise */
        { AS(wait6_args), (sy_call_t *)sys_wait6, AUE_WAIT6, NULL, 0, 0, 0, 
SY_THR_STATIC },    /* 532 = wait6 */
        { AS(cap_rights_limit_args), (sy_call_t *)sys_cap_rights_limit, 
AUE_CAP_RIGHTS_LIMIT, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },      /* 533 
= cap_rights_limit */
        { AS(cap_ioctls_limit_args), (sy_call_t *)sys_cap_ioctls_limit, 
AUE_CAP_IOCTLS_LIMIT, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC },      /* 534 
= cap_ioctls_limit */
@@ -588,8 +588,8 @@ struct sysent sysent[] = {
        { AS(chflagsat_args), (sy_call_t *)sys_chflagsat, AUE_CHFLAGSAT, NULL, 
0, 0, SYF_CAPENABLED, SY_THR_STATIC },   /* 540 = chflagsat */
        { AS(accept4_args), (sy_call_t *)sys_accept4, AUE_ACCEPT, NULL, 0, 0, 
SYF_CAPENABLED, SY_THR_STATIC },  /* 541 = accept4 */
        { AS(pipe2_args), (sy_call_t *)sys_pipe2, AUE_PIPE, NULL, 0, 0, 
SYF_CAPENABLED, SY_THR_STATIC },        /* 542 = pipe2 */
-       { AS(aio_mlock_args), (sy_call_t *)sys_aio_mlock, AUE_NULL, NULL, 0, 0, 
0, SY_THR_STATIC },     /* 543 = aio_mlock */
-       { AS(procctl_args), (sy_call_t *)sys_procctl, AUE_NULL, NULL, 0, 0, 0, 
SY_THR_STATIC }, /* 544 = procctl */
+       { AS(aio_mlock_args), (sy_call_t *)sys_aio_mlock, AUE_AIO_MLOCK, NULL, 
0, 0, 0, SY_THR_STATIC },        /* 543 = aio_mlock */
+       { AS(procctl_args), (sy_call_t *)sys_procctl, AUE_PROCCTL, NULL, 0, 0, 
0, SY_THR_STATIC },      /* 544 = procctl */
        { AS(ppoll_args), (sy_call_t *)sys_ppoll, AUE_POLL, NULL, 0, 0, 0, 
SY_THR_STATIC },     /* 545 = ppoll */
        { AS(futimens_args), (sy_call_t *)sys_futimens, AUE_FUTIMES, NULL, 0, 
0, SYF_CAPENABLED, SY_THR_STATIC },       /* 546 = futimens */
        { AS(utimensat_args), (sy_call_t *)sys_utimensat, AUE_FUTIMESAT, NULL, 
0, 0, SYF_CAPENABLED, SY_THR_STATIC },   /* 547 = utimensat */

Modified: head/sys/kern/syscalls.master
==============================================================================
--- head/sys/kern/syscalls.master       Wed Mar 29 21:31:45 2017        
(r316181)
+++ head/sys/kern/syscalls.master       Wed Mar 29 22:33:56 2017        
(r316182)
@@ -348,7 +348,7 @@
 174    AUE_PWRITE      COMPAT6 { ssize_t pwrite(int fd, \
                                    const void *buf, \
                                    size_t nbyte, int pad, off_t offset); }
-175    AUE_NULL        STD     { int setfib(int fibnum); }
+175    AUE_SETFIB      STD     { int setfib(int fibnum); }
 176    AUE_NTP_ADJTIME STD     { int ntp_adjtime(struct timex *tp); }
 177    AUE_NULL        UNIMPL  sfork (BSD/OS 2.x)
 178    AUE_NULL        UNIMPL  getdescriptor (BSD/OS 2.x)
@@ -474,12 +474,12 @@
 250    AUE_MINHERIT    STD     { int minherit(void *addr, size_t len, \
                                    int inherit); }
 251    AUE_RFORK       STD     { int rfork(int flags); }
-252    AUE_NULL        OBSOL   openbsd_poll
+252    AUE_POLL        OBSOL   openbsd_poll
 253    AUE_ISSETUGID   STD     { int issetugid(void); }
 254    AUE_LCHOWN      STD     { int lchown(char *path, int uid, int gid); }
-255    AUE_NULL        STD     { int aio_read(struct aiocb *aiocbp); }
-256    AUE_NULL        STD     { int aio_write(struct aiocb *aiocbp); }
-257    AUE_NULL        STD     { int lio_listio(int mode, \
+255    AUE_AIO_READ    STD     { int aio_read(struct aiocb *aiocbp); }
+256    AUE_AIO_WRITE   STD     { int aio_write(struct aiocb *aiocbp); }
+257    AUE_LIO_LISTIO  STD     { int lio_listio(int mode, \
                                    struct aiocb * const *acb_list, \
                                    int nent, struct sigevent *sig); }
 258    AUE_NULL        UNIMPL  nosys
@@ -556,16 +556,16 @@
 312    AUE_SETRESGID   STD     { int setresgid(gid_t rgid, gid_t egid, \
                                    gid_t sgid); }
 313    AUE_NULL        OBSOL   signanosleep
-314    AUE_NULL        STD     { ssize_t aio_return(struct aiocb *aiocbp); }
-315    AUE_NULL        STD     { int aio_suspend( \
+314    AUE_AIO_RETURN  STD     { ssize_t aio_return(struct aiocb *aiocbp); }
+315    AUE_AIO_SUSPEND STD     { int aio_suspend( \
                                    struct aiocb * const * aiocbp, int nent, \
                                    const struct timespec *timeout); }
-316    AUE_NULL        STD     { int aio_cancel(int fd, \
+316    AUE_AIO_CANCEL  STD     { int aio_cancel(int fd, \
                                    struct aiocb *aiocbp); }
-317    AUE_NULL        STD     { int aio_error(struct aiocb *aiocbp); }
-318    AUE_NULL        COMPAT6 { int aio_read(struct oaiocb *aiocbp); }
-319    AUE_NULL        COMPAT6 { int aio_write(struct oaiocb *aiocbp); }
-320    AUE_NULL        COMPAT6 { int lio_listio(int mode, \
+317    AUE_AIO_ERROR   STD     { int aio_error(struct aiocb *aiocbp); }
+318    AUE_AIO_READ    COMPAT6 { int aio_read(struct oaiocb *aiocbp); }
+319    AUE_AIO_WRITE   COMPAT6 { int aio_write(struct oaiocb *aiocbp); }
+320    AUE_LIO_LISTIO  COMPAT6 { int lio_listio(int mode, \
                                    struct oaiocb * const *acb_list, \
                                    int nent, struct osigevent *sig); }
 321    AUE_NULL        STD     { int yield(void); }
@@ -615,21 +615,21 @@
                                    const struct timespec *timeout); }
 346    AUE_NULL        STD     { int sigwaitinfo(const sigset_t *set, \
                                    siginfo_t *info); }
-347    AUE_NULL        STD     { int __acl_get_file(const char *path, \
+347    AUE_ACL_GET_FILE        STD     { int __acl_get_file(const char *path, \
                                    acl_type_t type, struct acl *aclp); }
-348    AUE_NULL        STD     { int __acl_set_file(const char *path, \
+348    AUE_ACL_SET_FILE        STD     { int __acl_set_file(const char *path, \
                                    acl_type_t type, struct acl *aclp); }
-349    AUE_NULL        STD     { int __acl_get_fd(int filedes, \
+349    AUE_ACL_GET_FD  STD     { int __acl_get_fd(int filedes, \
                                    acl_type_t type, struct acl *aclp); }
-350    AUE_NULL        STD     { int __acl_set_fd(int filedes, \
+350    AUE_ACL_SET_FD  STD     { int __acl_set_fd(int filedes, \
                                    acl_type_t type, struct acl *aclp); }
-351    AUE_NULL        STD     { int __acl_delete_file(const char *path, \
+351    AUE_ACL_DELETE_FILE     STD     { int __acl_delete_file(const char 
*path, \
                                    acl_type_t type); }
-352    AUE_NULL        STD     { int __acl_delete_fd(int filedes, \
+352    AUE_ACL_DELETE_FD       STD     { int __acl_delete_fd(int filedes, \
                                    acl_type_t type); }
-353    AUE_NULL        STD     { int __acl_aclcheck_file(const char *path, \
+353    AUE_ACL_CHECK_FILE      STD     { int __acl_aclcheck_file(const char 
*path, \
                                    acl_type_t type, struct acl *aclp); }
-354    AUE_NULL        STD     { int __acl_aclcheck_fd(int filedes, \
+354    AUE_ACL_CHECK_FD        STD     { int __acl_aclcheck_fd(int filedes, \
                                    acl_type_t type, struct acl *aclp); }
 355    AUE_EXTATTRCTL  STD     { int extattrctl(const char *path, int cmd, \
                                    const char *filename, int attrnamespace, \
@@ -645,7 +645,7 @@
 358    AUE_EXTATTR_DELETE_FILE STD     { int extattr_delete_file(const char 
*path, \
                                    int attrnamespace, \
                                    const char *attrname); }
-359    AUE_NULL        STD     { ssize_t aio_waitcomplete( \
+359    AUE_AIO_WAITCOMPLETE    STD     { ssize_t aio_waitcomplete( \
                                    struct aiocb **aiocbp, \
                                    struct timespec *timeout); }
 360    AUE_GETRESUID   STD     { int getresuid(uid_t *ruid, uid_t *euid, \
@@ -653,7 +653,7 @@
 361    AUE_GETRESGID   STD     { int getresgid(gid_t *rgid, gid_t *egid, \
                                    gid_t *sgid); }
 362    AUE_KQUEUE      STD     { int kqueue(void); }
-363    AUE_NULL        STD     { int kevent(int fd, \
+363    AUE_KEVENT      STD     { int kevent(int fd, \
                                    struct kevent *changelist, int nchanges, \
                                    struct kevent *eventlist, int nevents, \
                                    const struct timespec *timeout); }
@@ -673,7 +673,7 @@
 373    AUE_EXTATTR_DELETE_FD   STD     { int extattr_delete_fd(int fd, \
                                    int attrnamespace, \
                                    const char *attrname); }
-374    AUE_NULL        STD     { int __setugid(int flag); }
+374    AUE_SETUGID     STD     { int __setugid(int flag); }
 375    AUE_NULL        UNIMPL  nfsclnt
 376    AUE_EACCESS     STD     { int eaccess(char *path, int amode); }
 377    AUE_NULL        NOSTD|NOTSTATIC { int afs3_syscall(long syscall, \
@@ -715,18 +715,18 @@
 398    AUE_FHSTATFS    STD     { int fhstatfs(const struct fhandle *u_fhp, \
                                    struct statfs *buf); }
 399    AUE_NULL        UNIMPL  nosys
-400    AUE_NULL        NOSTD   { int ksem_close(semid_t id); }
-401    AUE_NULL        NOSTD   { int ksem_post(semid_t id); }
-402    AUE_NULL        NOSTD   { int ksem_wait(semid_t id); }
-403    AUE_NULL        NOSTD   { int ksem_trywait(semid_t id); }
-404    AUE_NULL        NOSTD   { int ksem_init(semid_t *idp, \
+400    AUE_SEMCLOSE    NOSTD   { int ksem_close(semid_t id); }
+401    AUE_SEMPOST     NOSTD   { int ksem_post(semid_t id); }
+402    AUE_SEMWAIT     NOSTD   { int ksem_wait(semid_t id); }
+403    AUE_SEMTRYWAIT  NOSTD   { int ksem_trywait(semid_t id); }
+404    AUE_SEMINIT     NOSTD   { int ksem_init(semid_t *idp, \
                                    unsigned int value); }
-405    AUE_NULL        NOSTD   { int ksem_open(semid_t *idp, \
+405    AUE_SEMOPEN     NOSTD   { int ksem_open(semid_t *idp, \
                                    const char *name, int oflag, \
                                    mode_t mode, unsigned int value); }
-406    AUE_NULL        NOSTD   { int ksem_unlink(const char *name); }
-407    AUE_NULL        NOSTD   { int ksem_getvalue(semid_t id, int *val); }
-408    AUE_NULL        NOSTD   { int ksem_destroy(semid_t id); }
+406    AUE_SEMUNLINK   NOSTD   { int ksem_unlink(const char *name); }
+407    AUE_SEMGETVALUE NOSTD   { int ksem_getvalue(semid_t id, int *val); }
+408    AUE_SEMDESTROY  NOSTD   { int ksem_destroy(semid_t id); }
 409    AUE_NULL        STD     { int __mac_get_pid(pid_t pid, \
                                    struct mac *mac_p); }
 410    AUE_NULL        STD     { int __mac_get_link(const char *path_p, \
@@ -760,24 +760,24 @@
 423    AUE_NULL        STD     { int swapcontext(struct __ucontext *oucp, \
                                    const struct __ucontext *ucp); }
 424    AUE_SWAPOFF     STD     { int swapoff(const char *name); }

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to