Now that all system calls are MPSAFE, retire the SYF_MPSAFE flag used to

mark system calls as being MPSAFE:
- Stop conditionally acquiring Giant around system call invocations.
- Remove all of the 'M' prefixes from the master system call files.
- Remove support for the 'M' prefix from the script that generates the
  syscall-related files from the master system call files.
- Don't explicitly set SYF_MPSAFE when registering nfssvc.

2 files changed, 409 insertions, 413 deletions

diff --git a/sys/compat/freebsd32/syscalls.master b/sys/compat/freebsd32/syscalls.master
index ada6cb7..82314b1 100644
--- a/sys/compat/freebsd32/syscalls.master
+++ b/sys/compat/freebsd32/syscalls.master
@@ -5,16 +5,15 @@
 ; System call name/number master file.
 ; Processed to created init_sysent.c, syscalls.c and syscall.h.
 
-; Columns: number audit [M]type nargs name alt{name,tag,rtyp}/comments
+; Columns: number audit type nargs name alt{name,tag,rtyp}/comments
 ;	number	system call number, must be in order
 ;	audit	the audit event associated with the system call
 ;		A value of AUE_NULL means no auditing, but it also means that
 ;		there is no audit event for the call at this time. For the
 ;		case where the event exists, but we don't want auditing, the
 ;		event should be #defined to AUE_NULL in audit_kevents.h.
-;	type	one of [M]STD, [M]OBSOL, [M]UNIMPL, [M]COMPAT, [M]CPT_NOA,
-;		[M]LIBCOMPAT, [M]NODEF,  [M]NOARGS,  [M]NOPROTO,  [M]NOIMPL,
-;		[M]NOSTD, [M]COMPAT4
+;	type	one of STD, OBSOL, UNIMPL, COMPAT, CPT_NOA, LIBCOMPAT,
+;		NODEF, NOARGS, NOPROTO, NOIMPL, NOSTD, COMPAT4
 ;	name	psuedo-prototype of syscall routine
 ;		If one of the following alts is different, then all appear:
 ;	altname	name of system call if different
@@ -23,9 +22,6 @@
 ;		for UNIMPL/OBSOL, name continues with comments
 
 ; types:
-;	[M]	e.g. like MSTD -- means the system call is MP-safe.  If no
-;		M prefix is used, the syscall wrapper will obtain the Giant
-;		lock for the syscall.
 ;	STD	always included
 ;	COMPAT	included on COMPAT #ifdef
 ;	COMPAT4	included on COMPAT4 #ifdef (FreeBSD 4 compat)
@@ -51,213 +47,213 @@
 ; redistributions should be placed in the reserved range at the end
 ; of the current calls.
 
-0	AUE_NULL	MNOPROTO { int nosys(void); } syscall nosys_args int
-1	AUE_EXIT	MNOPROTO { void sys_exit(int rval); } exit \
+0	AUE_NULL	NOPROTO	{ int nosys(void); } syscall nosys_args int
+1	AUE_EXIT	NOPROTO	{ void sys_exit(int rval); } exit \
 				    sys_exit_args void
-2	AUE_FORK	MNOPROTO { int fork(void); }
-3	AUE_READ	MNOPROTO { ssize_t read(int fd, void *buf, \
+2	AUE_FORK	NOPROTO	{ int fork(void); }
+3	AUE_READ	NOPROTO	{ ssize_t read(int fd, void *buf, \
 				    size_t nbyte); }
-4	AUE_WRITE	MNOPROTO { ssize_t write(int fd, const void *buf, \
+4	AUE_WRITE	NOPROTO	{ ssize_t write(int fd, const void *buf, \
 				    size_t nbyte); }
-5	AUE_OPEN_RWTC	MNOPROTO { int open(char *path, int flags, \
+5	AUE_OPEN_RWTC	NOPROTO	{ int open(char *path, int flags, \
 				    int mode); }
-6	AUE_CLOSE	MNOPROTO { int close(int fd); }
-7	AUE_WAIT4	MSTD	{ int freebsd32_wait4(int pid, int *status, \
+6	AUE_CLOSE	NOPROTO	{ int close(int fd); }
+7	AUE_WAIT4	STD	{ int freebsd32_wait4(int pid, int *status, \
 				    int options, struct rusage32 *rusage); }
 8	AUE_CREAT	OBSOL	old creat
-9	AUE_LINK	MNOPROTO { int link(char *path, char *link); }
-10	AUE_UNLINK	MNOPROTO { int unlink(char *path); }
+9	AUE_LINK	NOPROTO	{ int link(char *path, char *link); }
+10	AUE_UNLINK	NOPROTO	{ int unlink(char *path); }
 11	AUE_NULL	OBSOL	execv
-12	AUE_CHDIR	MNOPROTO	{ int chdir(char *path); }
-13	AUE_FCHDIR	MNOPROTO	{ int fchdir(int fd); }
-14	AUE_MKNOD	MNOPROTO	{ int mknod(char *path, int mode, int dev); }
-15	AUE_CHMOD	MNOPROTO	{ int chmod(char *path, int mode); }
-16	AUE_CHOWN	MNOPROTO	{ int chown(char *path, int uid, int gid); }
-17	AUE_NULL	MNOPROTO { int obreak(char *nsize); } break \
+12	AUE_CHDIR	NOPROTO	{ int chdir(char *path); }
+13	AUE_FCHDIR	NOPROTO	{ int fchdir(int fd); }
+14	AUE_MKNOD	NOPROTO	{ int mknod(char *path, int mode, int dev); }
+15	AUE_CHMOD	NOPROTO	{ int chmod(char *path, int mode); }
+16	AUE_CHOWN	NOPROTO	{ int chown(char *path, int uid, int gid); }
+17	AUE_NULL	NOPROTO	{ int obreak(char *nsize); } break \
 				    obreak_args int
-18	AUE_GETFSSTAT	MCOMPAT4	{ int freebsd32_getfsstat( \
+18	AUE_GETFSSTAT	COMPAT4	{ int freebsd32_getfsstat( \
 				    struct statfs32 *buf, long bufsize, \
 				    int flags); }
 19	AUE_LSEEK	OBSOL	olseek
-20	AUE_GETPID	MNOPROTO { pid_t getpid(void); }
-21	AUE_MOUNT	MNOPROTO { int mount(char *type, char *path, \
+20	AUE_GETPID	NOPROTO	{ pid_t getpid(void); }
+21	AUE_MOUNT	NOPROTO	{ int mount(char *type, char *path, \
 				    int flags, caddr_t data); }
-22	AUE_UMOUNT	MNOPROTO { int unmount(char *path, int flags); }
-23	AUE_SETUID	MNOPROTO { int setuid(uid_t uid); }
-24	AUE_GETUID	MNOPROTO { uid_t getuid(void); }
-25	AUE_GETEUID	MNOPROTO { uid_t geteuid(void); }
-26	AUE_PTRACE	MNOPROTO { int ptrace(int req, pid_t pid, \
+22	AUE_UMOUNT	NOPROTO	{ int unmount(char *path, int flags); }
+23	AUE_SETUID	NOPROTO	{ int setuid(uid_t uid); }
+24	AUE_GETUID	NOPROTO	{ uid_t getuid(void); }
+25	AUE_GETEUID	NOPROTO	{ uid_t geteuid(void); }
+26	AUE_PTRACE	NOPROTO	{ int ptrace(int req, pid_t pid, \
 				    caddr_t addr, int data); }
 ; XXX implement
-27	AUE_RECVMSG	MSTD	 { int freebsd32_recvmsg(int s, struct msghdr32 *msg, \
+27	AUE_RECVMSG	STD	{ int freebsd32_recvmsg(int s, struct msghdr32 *msg, \
 				    int flags); }
-28	AUE_SENDMSG	MSTD	 { int freebsd32_sendmsg(int s, struct msghdr32 *msg, \
+28	AUE_SENDMSG	STD	{ int freebsd32_sendmsg(int s, struct msghdr32 *msg, \
 				    int flags); }
-29	AUE_RECVFROM	MSTD	 { int freebsd32_recvfrom(int s, u_int32_t buf, \
+29	AUE_RECVFROM	STD	{ int freebsd32_recvfrom(int s, u_int32_t buf, \
 				    u_int32_t len, int flags, u_int32_t from, \
 				    u_int32_t fromlenaddr); }
-30	AUE_ACCEPT	MNOPROTO { int accept(int s, caddr_t name, \
+30	AUE_ACCEPT	NOPROTO	{ int accept(int s, caddr_t name, \
 				    int *anamelen); }
-31	AUE_GETPEERNAME	MNOPROTO { int getpeername(int fdes, caddr_t asa, \
+31	AUE_GETPEERNAME	NOPROTO	{ int getpeername(int fdes, caddr_t asa, \
 				    int *alen); }
-32	AUE_GETSOCKNAME	MNOPROTO { int getsockname(int fdes, caddr_t asa, \
+32	AUE_GETSOCKNAME	NOPROTO	{ int getsockname(int fdes, caddr_t asa, \
 				    int *alen); }
-33	AUE_ACCESS	MNOPROTO	{ int access(char *path, int flags); }
-34	AUE_CHFLAGS	MNOPROTO	{ int chflags(char *path, int flags); }
-35	AUE_FCHFLAGS	MNOPROTO	{ int fchflags(int fd, int flags); }
-36	AUE_SYNC	MNOPROTO	{ int sync(void); }
-37	AUE_KILL	MNOPROTO { int kill(int pid, int signum); }
+33	AUE_ACCESS	NOPROTO	{ int access(char *path, int flags); }
+34	AUE_CHFLAGS	NOPROTO	{ int chflags(char *path, int flags); }
+35	AUE_FCHFLAGS	NOPROTO	{ int fchflags(int fd, int flags); }
+36	AUE_SYNC	NOPROTO	{ int sync(void); }
+37	AUE_KILL	NOPROTO	{ int kill(int pid, int signum); }
 38	AUE_STAT	UNIMPL	ostat
-39	AUE_GETPPID	MNOPROTO { pid_t getppid(void); }
+39	AUE_GETPPID	NOPROTO	{ pid_t getppid(void); }
 40	AUE_LSTAT	UNIMPL	olstat
-41	AUE_DUP		MNOPROTO { int dup(u_int fd); }
-42	AUE_PIPE	MNOPROTO { int pipe(void); }
-43	AUE_GETEGID	MNOPROTO { gid_t getegid(void); }
-44	AUE_PROFILE	MNOPROTO { int profil(caddr_t samples, size_t size, \
+41	AUE_DUP		NOPROTO	{ int dup(u_int fd); }
+42	AUE_PIPE	NOPROTO	{ int pipe(void); }
+43	AUE_GETEGID	NOPROTO	{ gid_t getegid(void); }
+44	AUE_PROFILE	NOPROTO	{ int profil(caddr_t samples, size_t size, \
 				    size_t offset, u_int scale); }
-45	AUE_KTRACE	MNOPROTO { int ktrace(const char *fname, int ops, \
+45	AUE_KTRACE	NOPROTO	{ int ktrace(const char *fname, int ops, \
 				    int facs, int pid); }
-46	AUE_SIGACTION	MCOMPAT	 { int freebsd32_sigaction( int signum, \
+46	AUE_SIGACTION	COMPAT	{ int freebsd32_sigaction( int signum, \
 				   struct osigaction32 *nsa, \
 				   struct osigaction32 *osa); }
-47	AUE_GETGID	MNOPROTO { gid_t getgid(void); }
-48	AUE_SIGPROCMASK	MCOMPAT	 { int freebsd32_sigprocmask(int how, \
+47	AUE_GETGID	NOPROTO	{ gid_t getgid(void); }
+48	AUE_SIGPROCMASK	COMPAT	{ int freebsd32_sigprocmask(int how, \
 				   osigset_t mask); }
-49	AUE_GETLOGIN	MNOPROTO { int getlogin(char *namebuf, \
+49	AUE_GETLOGIN	NOPROTO	{ int getlogin(char *namebuf, \
 				    u_int namelen); }
-50	AUE_SETLOGIN	MNOPROTO { int setlogin(char *namebuf); }
-51	AUE_ACCT	MNOPROTO { int acct(char *path); }
-52	AUE_SIGPENDING	MCOMPAT	 { int freebsd32_sigpending(void); }
-53	AUE_SIGPENDING	MSTD	{ int freebsd32_sigaltstack( \
+50	AUE_SETLOGIN	NOPROTO	{ int setlogin(char *namebuf); }
+51	AUE_ACCT	NOPROTO	{ int acct(char *path); }
+52	AUE_SIGPENDING	COMPAT	{ int freebsd32_sigpending(void); }
+53	AUE_SIGPENDING	STD	{ int freebsd32_sigaltstack( \
 				    struct sigaltstack32 *ss, \
 				    struct sigaltstack32 *oss); }
-54	AUE_IOCTL	MNOPROTO { int ioctl(int fd, u_long com, \
+54	AUE_IOCTL	NOPROTO	{ int ioctl(int fd, u_long com, \
 				    caddr_t data); }
-55	AUE_REBOOT	MNOPROTO { int reboot(int opt); }
-56	AUE_REVOKE	MNOPROTO	{ int revoke(char *path); }
-57	AUE_SYMLINK	MNOPROTO	{ int symlink(char *path, char *link); }
-58	AUE_READLINK	MNOPROTO	{ int readlink(char *path, char *buf, \
+55	AUE_REBOOT	NOPROTO	{ int reboot(int opt); }
+56	AUE_REVOKE	NOPROTO	{ int revoke(char *path); }
+57	AUE_SYMLINK	NOPROTO	{ int symlink(char *path, char *link); }
+58	AUE_READLINK	NOPROTO	{ int readlink(char *path, char *buf, \
 				    int count); }
-59	AUE_EXECVE	MSTD	 { int freebsd32_execve(char *fname, \
+59	AUE_EXECVE	STD	{ int freebsd32_execve(char *fname, \
 				    u_int32_t *argv, u_int32_t *envv); }
-60	AUE_UMASK	MNOPROTO { int umask(int newmask); } umask \
+60	AUE_UMASK	NOPROTO	{ int umask(int newmask); } umask \
 				    umask_args int
-61	AUE_CHROOT	MNOPROTO	{ int chroot(char *path); }
+61	AUE_CHROOT	NOPROTO	{ int chroot(char *path); }
 62	AUE_FSTAT	OBSOL	ofstat
 63	AUE_NULL	OBSOL	ogetkerninfo
 64	AUE_GETPAGESIZE	OBSOL	ogetpagesize
 ; XXX implement (not OBSOL at all)
-65	AUE_MSYNC	MNOPROTO { int msync(void *addr, size_t len, \
+65	AUE_MSYNC	NOPROTO	{ int msync(void *addr, size_t len, \
 				    int flags); }
-66	AUE_VFORK	MNOPROTO { int vfork(void); }
+66	AUE_VFORK	NOPROTO	{ int vfork(void); }
 67	AUE_NULL	OBSOL	vread
 68	AUE_NULL	OBSOL	vwrite
-69	AUE_SBRK	MNOPROTO { int sbrk(int incr); }
-70	AUE_SSTK	MNOPROTO { int sstk(int incr); }
+69	AUE_SBRK	NOPROTO	{ int sbrk(int incr); }
+70	AUE_SSTK	NOPROTO	{ int sstk(int incr); }
 71	AUE_MMAP	OBSOL	ommap
-72	AUE_O_VADVISE	MNOPROTO { int ovadvise(int anom); } vadvise \
+72	AUE_O_VADVISE	NOPROTO	{ int ovadvise(int anom); } vadvise \
 				    ovadvise_args int
-73	AUE_MUNMAP	MNOPROTO { int munmap(void *addr, size_t len); }
-74	AUE_MPROTECT	MNOPROTO { int mprotect(const void *addr, \
+73	AUE_MUNMAP	NOPROTO	{ int munmap(void *addr, size_t len); }
+74	AUE_MPROTECT	NOPROTO	{ int mprotect(const void *addr, \
 				    size_t len, int prot); }
-75	AUE_MADVISE	MNOPROTO { int madvise(void *addr, size_t len, \
+75	AUE_MADVISE	NOPROTO	{ int madvise(void *addr, size_t len, \
 				    int behav); }
 76	AUE_NULL	OBSOL	vhangup
 77	AUE_NULL	OBSOL	vlimit
-78	AUE_MINCORE	MNOPROTO { int mincore(const void *addr, size_t len, \
+78	AUE_MINCORE	NOPROTO	{ int mincore(const void *addr, size_t len, \
 				    char *vec); }
-79	AUE_GETGROUPS	MNOPROTO { int getgroups(u_int gidsetsize, \
+79	AUE_GETGROUPS	NOPROTO	{ int getgroups(u_int gidsetsize, \
 				    gid_t *gidset); }
-80	AUE_SETGROUPS	MNOPROTO { int setgroups(u_int gidsetsize, \
+80	AUE_SETGROUPS	NOPROTO	{ int setgroups(u_int gidsetsize, \
 				    gid_t *gidset); }
-81	AUE_GETPGRP	MNOPROTO { int getpgrp(void); }
-82	AUE_SETPGRP	MNOPROTO { int setpgid(int pid, int pgid); }
-83	AUE_SETITIMER	MSTD	{ int freebsd32_setitimer(u_int which, \
+81	AUE_GETPGRP	NOPROTO	{ int getpgrp(void); }
+82	AUE_SETPGRP	NOPROTO	{ int setpgid(int pid, int pgid); }
+83	AUE_SETITIMER	STD	{ int freebsd32_setitimer(u_int which, \
 				    struct itimerval32 *itv, \
 				    struct itimerval32 *oitv); }
 84	AUE_NULL	OBSOL	owait
 ; XXX implement
 85	AUE_SWAPON	OBSOL	oswapon
-86	AUE_GETITIMER	MSTD	{ int freebsd32_getitimer(u_int which, \
+86	AUE_GETITIMER	STD	{ int freebsd32_getitimer(u_int which, \
 				    struct itimerval32 *itv); }
 87	AUE_O_GETHOSTNAME	OBSOL	ogethostname
 88	AUE_O_SETHOSTNAME	OBSOL	osethostname
-89	AUE_GETDTABLESIZE	MNOPROTO { int getdtablesize(void); }
-90	AUE_DUP2	MNOPROTO { int dup2(u_int from, u_int to); }
+89	AUE_GETDTABLESIZE	NOPROTO	{ int getdtablesize(void); }
+90	AUE_DUP2	NOPROTO	{ int dup2(u_int from, u_int to); }
 91	AUE_NULL	UNIMPL	getdopt
-92	AUE_FCNTL	MNOPROTO { int fcntl(int fd, int cmd, long arg); }
-93	AUE_SELECT	MSTD	{ int freebsd32_select(int nd, fd_set *in, \
+92	AUE_FCNTL	NOPROTO	{ int fcntl(int fd, int cmd, long arg); }
+93	AUE_SELECT	STD	{ int freebsd32_select(int nd, fd_set *in, \
 				    fd_set *ou, fd_set *ex, \
 				    struct timeval32 *tv); }
 ; XXX need to override for big-endian - little-endian should work fine.
 94	AUE_NULL	UNIMPL	setdopt
-95	AUE_FSYNC	MNOPROTO	{ int fsync(int fd); }
-96	AUE_SETPRIORITY	MNOPROTO { int setpriority(int which, int who, \
+95	AUE_FSYNC	NOPROTO	{ int fsync(int fd); }
+96	AUE_SETPRIORITY	NOPROTO	{ int setpriority(int which, int who, \
 				    int prio); }
-97	AUE_SOCKET	MNOPROTO { int socket(int domain, int type, \
+97	AUE_SOCKET	NOPROTO	{ int socket(int domain, int type, \
 				    int protocol); }
-98	AUE_CONNECT	MNOPROTO { int connect(int s, caddr_t name, \
+98	AUE_CONNECT	NOPROTO	{ int connect(int s, caddr_t name, \
 				    int namelen); }
 99	AUE_NULL	OBSOL	oaccept
-100	AUE_GETPRIORITY	MNOPROTO { int getpriority(int which, int who); }
+100	AUE_GETPRIORITY	NOPROTO	{ int getpriority(int which, int who); }
 101	AUE_NULL	OBSOL	osend
 102	AUE_NULL	OBSOL	orecv
 103	AUE_NULL	OBSOL	osigreturn
-104	AUE_BIND	MNOPROTO { int bind(int s, caddr_t name, \
+104	AUE_BIND	NOPROTO	{ int bind(int s, caddr_t name, \
 				    int namelen); }
-105	AUE_SETSOCKOPT	MNOPROTO { int setsockopt(int s, int level, \
+105	AUE_SETSOCKOPT	NOPROTO	{ int setsockopt(int s, int level, \
 				    int name, caddr_t val, int valsize); }
-106	AUE_LISTEN	MNOPROTO { int listen(int s, int backlog); }
+106	AUE_LISTEN	NOPROTO	{ int listen(int s, int backlog); }
 107	AUE_NULL	OBSOL	vtimes
-108	AUE_O_SIGVEC	MCOMPAT	 { int freebsd32_sigvec(int signum, \
+108	AUE_O_SIGVEC	COMPAT	{ int freebsd32_sigvec(int signum, \
 				     struct sigvec32 *nsv, \
 				     struct sigvec32 *osv); }
-109	AUE_O_SIGBLOCK	MCOMPAT	 { int freebsd32_sigblock(int mask); }
-110	AUE_O_SIGSETMASK	MCOMPAT	 { int freebsd32_sigsetmask( int mask); }
-111	AUE_SIGSUSPEND	MCOMPAT	 { int freebsd32_sigsuspend( int mask); }
-112	AUE_O_SIGSTACK	MCOMPAT	 { int freebsd32_sigstack( \
+109	AUE_O_SIGBLOCK	COMPAT	{ int freebsd32_sigblock(int mask); }
+110	AUE_O_SIGSETMASK	COMPAT	{ int freebsd32_sigsetmask( int mask); }
+111	AUE_SIGSUSPEND	COMPAT	{ int freebsd32_sigsuspend( int mask); }
+112	AUE_O_SIGSTACK	COMPAT	{ int freebsd32_sigstack( \
 				     struct sigstack32 *nss, \
 				     struct sigstack32 *oss); }
 113	AUE_NULL	OBSOL	orecvmsg
 114	AUE_NULL	OBSOL	osendmsg
 115	AUE_NULL	OBSOL	vtrace
-116	AUE_GETTIMEOFDAY	MSTD	{ int freebsd32_gettimeofday( \
+116	AUE_GETTIMEOFDAY	STD	{ int freebsd32_gettimeofday( \
 				    struct timeval32 *tp, \
 				    struct timezone *tzp); }
-117	AUE_GETRUSAGE	MSTD	{ int freebsd32_getrusage(int who, \
+117	AUE_GETRUSAGE	STD	{ int freebsd32_getrusage(int who, \
 				    struct rusage32 *rusage); }
-118	AUE_GETSOCKOPT	MNOPROTO { int getsockopt(int s, int level, \
+118	AUE_GETSOCKOPT	NOPROTO	{ int getsockopt(int s, int level, \
 				    int name, caddr_t val, int *avalsize); }
 119	AUE_NULL	UNIMPL	resuba (BSD/OS 2.x)
-120	AUE_READV	MSTD	{ int freebsd32_readv(int fd, \
+120	AUE_READV	STD	{ int freebsd32_readv(int fd, \
 				    struct iovec32 *iovp, u_int iovcnt); }
-121	AUE_WRITEV	MSTD	{ int freebsd32_writev(int fd, \
+121	AUE_WRITEV	STD	{ int freebsd32_writev(int fd, \
 				    struct iovec32 *iovp, u_int iovcnt); }
-122	AUE_SETTIMEOFDAY	MSTD	{ int freebsd32_settimeofday( \
+122	AUE_SETTIMEOFDAY	STD	{ int freebsd32_settimeofday( \
 				    struct timeval32 *tv, \
 				    struct timezone *tzp); }
-123	AUE_FCHOWN	MNOPROTO	{ int fchown(int fd, int uid, int gid); }
-124	AUE_FCHMOD	MNOPROTO	{ int fchmod(int fd, int mode); }
+123	AUE_FCHOWN	NOPROTO	{ int fchown(int fd, int uid, int gid); }
+124	AUE_FCHMOD	NOPROTO	{ int fchmod(int fd, int mode); }
 125	AUE_RECVFROM	OBSOL	orecvfrom
-126	AUE_SETREUID	MNOPROTO { int setreuid(int ruid, int euid); }
-127	AUE_SETREGID	MNOPROTO { int setregid(int rgid, int egid); }
-128	AUE_RENAME	MNOPROTO	{ int rename(char *from, char *to); }
+126	AUE_SETREUID	NOPROTO	{ int setreuid(int ruid, int euid); }
+127	AUE_SETREGID	NOPROTO	{ int setregid(int rgid, int egid); }
+128	AUE_RENAME	NOPROTO	{ int rename(char *from, char *to); }
 129	AUE_NULL	OBSOL	otruncate
 130	AUE_NULL	OBSOL	ftruncate
-131	AUE_FLOCK	MNOPROTO { int flock(int fd, int how); }
-132	AUE_MKFIFO	MNOPROTO	{ int mkfifo(char *path, int mode); }
-133	AUE_SENDTO	MNOPROTO { int sendto(int s, caddr_t buf, \
+131	AUE_FLOCK	NOPROTO	{ int flock(int fd, int how); }
+132	AUE_MKFIFO	NOPROTO	{ int mkfifo(char *path, int mode); }
+133	AUE_SENDTO	NOPROTO	{ int sendto(int s, caddr_t buf, \
 				    size_t len, int flags, caddr_t to, \
 				    int tolen); }
-134	AUE_SHUTDOWN	MNOPROTO { int shutdown(int s, int how); }
-135	AUE_SOCKETPAIR	MNOPROTO { int socketpair(int domain, int type, \
+134	AUE_SHUTDOWN	NOPROTO	{ int shutdown(int s, int how); }
+135	AUE_SOCKETPAIR	NOPROTO	{ int socketpair(int domain, int type, \
 				    int protocol, int *rsv); }
-136	AUE_MKDIR	MNOPROTO	{ int mkdir(char *path, int mode); }
-137	AUE_RMDIR	MNOPROTO	{ int rmdir(char *path); }
-138	AUE_UTIMES	MSTD	{ int freebsd32_utimes(char *path, \
+136	AUE_MKDIR	NOPROTO	{ int mkdir(char *path, int mode); }
+137	AUE_RMDIR	NOPROTO	{ int rmdir(char *path); }
+138	AUE_UTIMES	STD	{ int freebsd32_utimes(char *path, \
 				    struct timeval32 *tptr); }
 139	AUE_NULL	OBSOL	4.2 sigreturn
-140	AUE_ADJTIME	MSTD	{ int freebsd32_adjtime( \
+140	AUE_ADJTIME	STD	{ int freebsd32_adjtime( \
 				    struct timeval32 *delta, \
 				    struct timeval32 *olddelta); }
 141	AUE_NULL	OBSOL	ogetpeername
@@ -266,8 +262,8 @@
 144	AUE_NULL	OBSOL	getrlimit
 145	AUE_NULL	OBSOL	setrlimit
 146	AUE_NULL	OBSOL	killpg
-147	AUE_SETSID	MNOPROTO { int setsid(void); }
-148	AUE_QUOTACTL	MNOPROTO	{ int quotactl(char *path, int cmd, int uid, \
+147	AUE_SETSID	NOPROTO	{ int setsid(void); }
+148	AUE_QUOTACTL	NOPROTO	{ int quotactl(char *path, int cmd, int uid, \
 				    caddr_t arg); }
 149	AUE_NULL	OBSOL oquota
 150	AUE_NULL	OBSOL ogetsockname
@@ -284,102 +280,102 @@
 ; XXX this is a problem!!!
 155	AUE_NFSSVC	UNIMPL	nfssvc
 156	AUE_NULL	OBSOL	ogetdirentries
-157	AUE_STATFS	MCOMPAT4	{ int freebsd32_statfs(char *path, \
+157	AUE_STATFS	COMPAT4	{ int freebsd32_statfs(char *path, \
 				    struct statfs32 *buf); }
-158	AUE_FSTATFS	MCOMPAT4	{ int freebsd32_fstatfs(int fd, \
+158	AUE_FSTATFS	COMPAT4	{ int freebsd32_fstatfs(int fd, \
 				    struct statfs32 *buf); }
 159	AUE_NULL	UNIMPL	nosys
 160	AUE_NULL	UNIMPL	nosys
-161	AUE_NFS_GETFH	MNOPROTO	{ int getfh(char *fname, \
+161	AUE_NFS_GETFH	NOPROTO	{ int getfh(char *fname, \
 				    struct fhandle *fhp); }
-162	AUE_O_GETDOMAINNAME	MNOPROTO { int getdomainname(char *domainname, \
+162	AUE_O_GETDOMAINNAME	NOPROTO	{ int getdomainname(char *domainname, \
 				    int len); }
-163	AUE_O_SETDOMAINNAME	MNOPROTO { int setdomainname(char *domainname, \
+163	AUE_O_SETDOMAINNAME	NOPROTO	{ int setdomainname(char *domainname, \
 				    int len); }
-164	AUE_NULL	MNOPROTO { int uname(struct utsname *name); }
-165	AUE_NULL	MNOPROTO { int sysarch(int op, char *parms); }
-166	AUE_NULL	MNOPROTO { int rtprio(int function, pid_t pid, \
+164	AUE_NULL	NOPROTO	{ int uname(struct utsname *name); }
+165	AUE_NULL	NOPROTO	{ int sysarch(int op, char *parms); }
+166	AUE_NULL	NOPROTO	{ int rtprio(int function, pid_t pid, \
 				    struct rtprio *rtp); }
 167	AUE_NULL	UNIMPL	nosys
 168	AUE_NULL	UNIMPL	nosys
-169	AUE_SEMSYS	MSTD	{ int freebsd32_semsys(int which, int a2, \
+169	AUE_SEMSYS	STD	{ int freebsd32_semsys(int which, int a2, \
 				    int a3, int a4, int a5); }
-170	AUE_MSGSYS	MSTD	{ int freebsd32_msgsys(int which, int a2, \
+170	AUE_MSGSYS	STD	{ int freebsd32_msgsys(int which, int a2, \
 				    int a3, int a4, int a5, int a6); }
-171	AUE_SHMSYS	MSTD	{ int freebsd32_shmsys(uint32_t which, uint32_t a2, \
+171	AUE_SHMSYS	STD	{ int freebsd32_shmsys(uint32_t which, uint32_t a2, \
 				    uint32_t a3, uint32_t a4); }
 172	AUE_NULL	UNIMPL	nosys
-173	AUE_PREAD	MSTD	{ ssize_t freebsd32_pread(int fd, void *buf, \
+173	AUE_PREAD	STD	{ ssize_t freebsd32_pread(int fd, void *buf, \
 				    size_t nbyte, int pad, \
 				    u_int32_t offsetlo, u_int32_t offsethi); }
 ; XXX note - bigendian is different
-174	AUE_PWRITE	MSTD	{ ssize_t freebsd32_pwrite(int fd, \
+174	AUE_PWRITE	STD	{ ssize_t freebsd32_pwrite(int fd, \
 				    const void *buf, size_t nbyte, int pad, \
 				    u_int32_t offsetlo, u_int32_t offsethi); }
 ; XXX note - bigendian is different
 175	AUE_NULL	UNIMPL	nosys
-176	AUE_ADJTIME	MNOPROTO { int ntp_adjtime(struct timex *tp); }
+176	AUE_ADJTIME	NOPROTO	{ int ntp_adjtime(struct timex *tp); }
 177	AUE_NULL	UNIMPL	sfork (BSD/OS 2.x)
 178	AUE_NULL	UNIMPL	getdescriptor (BSD/OS 2.x)
 179	AUE_NULL	UNIMPL	setdescriptor (BSD/OS 2.x)
 180	AUE_NULL	UNIMPL	nosys
 
 ; Syscalls 181-199 are used by/reserved for BSD
-181	AUE_SETGID	MNOPROTO { int setgid(gid_t gid); }
-182	AUE_SETEGID	MNOPROTO { int setegid(gid_t egid); }
-183	AUE_SETEUID	MNOPROTO { int seteuid(uid_t euid); }
+181	AUE_SETGID	NOPROTO	{ int setgid(gid_t gid); }
+182	AUE_SETEGID	NOPROTO	{ int setegid(gid_t egid); }
+183	AUE_SETEUID	NOPROTO	{ int seteuid(uid_t euid); }
 184	AUE_NULL	UNIMPL	lfs_bmapv
 185	AUE_NULL	UNIMPL	lfs_markv
 186	AUE_NULL	UNIMPL	lfs_segclean
 187	AUE_NULL	UNIMPL	lfs_segwait
-188	AUE_STAT	MSTD	{ int freebsd32_stat(char *path, \
+188	AUE_STAT	STD	{ int freebsd32_stat(char *path, \
 				    struct stat32 *ub); }
-189	AUE_FSTAT	MSTD	{ int freebsd32_fstat(int fd, \
+189	AUE_FSTAT	STD	{ int freebsd32_fstat(int fd, \
 				    struct stat32 *ub); }
-190	AUE_LSTAT	MSTD	{ int freebsd32_lstat(char *path, \
+190	AUE_LSTAT	STD	{ int freebsd32_lstat(char *path, \
 				    struct stat32 *ub); }
-191	AUE_PATHCONF	MNOPROTO	{ int pathconf(char *path, int name); }
-192	AUE_FPATHCONF	MNOPROTO { int fpathconf(int fd, int name); }
+191	AUE_PATHCONF	NOPROTO	{ int pathconf(char *path, int name); }
+192	AUE_FPATHCONF	NOPROTO	{ int fpathconf(int fd, int name); }
 193	AUE_NULL	UNIMPL	nosys
-194	AUE_GETRLIMIT	MNOPROTO { int getrlimit(u_int which, \
+194	AUE_GETRLIMIT	NOPROTO	{ int getrlimit(u_int which, \
 				    struct rlimit *rlp); } getrlimit \
 				    __getrlimit_args int
-195	AUE_SETRLIMIT	MNOPROTO { int setrlimit(u_int which, \
+195	AUE_SETRLIMIT	NOPROTO	{ int setrlimit(u_int which, \
 				    struct rlimit *rlp); } setrlimit \
 				    __setrlimit_args int
-196	AUE_GETDIRENTRIES	MNOPROTO	{ int getdirentries(int fd, char *buf, \
+196	AUE_GETDIRENTRIES	NOPROTO	{ int getdirentries(int fd, char *buf, \
 				    u_int count, long *basep); }
-197	AUE_MMAP	MSTD 	{ caddr_t freebsd32_mmap(caddr_t addr, \
+197	AUE_MMAP	STD 	{ caddr_t freebsd32_mmap(caddr_t addr, \
 				    size_t len, int prot, int flags, int fd, \
 				    int pad, u_int32_t poslo, \
 				    u_int32_t poshi); }
-198	AUE_NULL	MNOPROTO	{ int nosys(void); } __syscall \
+198	AUE_NULL	NOPROTO	{ int nosys(void); } __syscall \
 				    __syscall_args int
 ; XXX note - bigendian is different
-199	AUE_LSEEK	MSTD	{ off_t freebsd32_lseek(int fd, int pad, \
+199	AUE_LSEEK	STD	{ off_t freebsd32_lseek(int fd, int pad, \
 				    u_int32_t offsetlo, u_int32_t offsethi, \
 				    int whence); }
 ; XXX note - bigendian is different
-200	AUE_TRUNCATE	MSTD	{ int freebsd32_truncate(char *path, \
+200	AUE_TRUNCATE	STD	{ int freebsd32_truncate(char *path, \
 				    int pad, u_int32_t lengthlo, \
 				    u_int32_t lengthhi); }
 ; XXX note - bigendian is different
-201	AUE_FTRUNCATE	MSTD	{ int freebsd32_ftruncate(int fd, int pad, \
+201	AUE_FTRUNCATE	STD	{ int freebsd32_ftruncate(int fd, int pad, \
 				    u_int32_t lengthlo, u_int32_t lengthhi); }
-202	AUE_SYSCTL	MSTD	{ int freebsd32_sysctl(int *name, \
+202	AUE_SYSCTL	STD	{ int freebsd32_sysctl(int *name, \
 				    u_int namelen, void *old, \
 				    u_int32_t *oldlenp, void *new, \
 				    u_int32_t newlen); }
-203	AUE_MLOCK	MNOPROTO { int mlock(const void *addr, \
+203	AUE_MLOCK	NOPROTO	{ int mlock(const void *addr, \
 				    size_t len); }
-204	AUE_MUNLOCK	MNOPROTO { int munlock(const void *addr, \
+204	AUE_MUNLOCK	NOPROTO	{ int munlock(const void *addr, \
 				    size_t len); }
-205	AUE_UNDELETE	MNOPROTO	{ int undelete(char *path); }
-206	AUE_FUTIMES	MSTD	{ int freebsd32_futimes(int fd, \
+205	AUE_UNDELETE	NOPROTO	{ int undelete(char *path); }
+206	AUE_FUTIMES	STD	{ int freebsd32_futimes(int fd, \
 				    struct timeval32 *tptr); }
-207	AUE_GETPGID	MNOPROTO { int getpgid(pid_t pid); }
+207	AUE_GETPGID	NOPROTO	{ int getpgid(pid_t pid); }
 208	AUE_NULL	UNIMPL	newreboot (NetBSD)
-209	AUE_POLL	MNOPROTO { int poll(struct pollfd *fds, u_int nfds, \
+209	AUE_POLL	NOPROTO	{ int poll(struct pollfd *fds, u_int nfds, \
 				    int timeout); }
 
 ;
@@ -400,40 +396,40 @@
 ; The following were introduced with NetBSD/4.4Lite-2
 ; They are initialized by thier respective modules/sysinits
 ; XXX PROBLEM!!
-220	AUE_SEMCTL	MNOPROTO { int __semctl(int semid, int semnum, \
+220	AUE_SEMCTL	NOPROTO	{ int __semctl(int semid, int semnum, \
 				    int cmd, union semun *arg); }
-221	AUE_SEMGET	MNOPROTO { int semget(key_t key, int nsems, \
+221	AUE_SEMGET	NOPROTO	{ int semget(key_t key, int nsems, \
 				    int semflg); }
-222	AUE_SEMOP	MNOPROTO { int semop(int semid, struct sembuf *sops, \
+222	AUE_SEMOP	NOPROTO	{ int semop(int semid, struct sembuf *sops, \
 				    u_int nsops); }
 223	AUE_NULL	UNIMPL	semconfig
-224	AUE_MSGCTL	MNOPROTO { int msgctl(int msqid, int cmd, \
+224	AUE_MSGCTL	NOPROTO	{ int msgctl(int msqid, int cmd, \
 				    struct msqid_ds *buf); }
-225	AUE_MSGGET	MNOPROTO { int msgget(key_t key, int msgflg); }
-226	AUE_MSGSND	MNOPROTO { int msgsnd(int msqid, void *msgp, \
+225	AUE_MSGGET	NOPROTO	{ int msgget(key_t key, int msgflg); }
+226	AUE_MSGSND	NOPROTO	{ int msgsnd(int msqid, void *msgp, \
 				    size_t msgsz, int msgflg); }
-227	AUE_MSGRCV	MNOPROTO { int msgrcv(int msqid, void *msgp, \
+227	AUE_MSGRCV	NOPROTO	{ int msgrcv(int msqid, void *msgp, \
 				    size_t msgsz, long msgtyp, int msgflg); }
-228	AUE_SHMAT	MNOPROTO { int shmat(int shmid, void *shmaddr, \
+228	AUE_SHMAT	NOPROTO	{ int shmat(int shmid, void *shmaddr, \
 				    int shmflg); }
-229	AUE_SHMCTL	MSTD	 { int freebsd32_shmctl(int shmid, int cmd, \
+229	AUE_SHMCTL	STD	{ int freebsd32_shmctl(int shmid, int cmd, \
 				    struct shmid_ds *buf); }
-230	AUE_SHMDT	MNOPROTO { int shmdt(void *shmaddr); }
-231	AUE_SHMGET	MNOPROTO { int shmget(key_t key, int size, \
+230	AUE_SHMDT	NOPROTO	{ int shmdt(void *shmaddr); }
+231	AUE_SHMGET	NOPROTO	{ int shmget(key_t key, int size, \
 				    int shmflg); }
 ;
-232	AUE_NULL	MSTD 	 { int freebsd32_clock_gettime(clockid_t clock_id, \
+232	AUE_NULL	STD 	{ int freebsd32_clock_gettime(clockid_t clock_id, \
 				    struct timespec32 *tp); }
-233	AUE_CLOCK_SETTIME	MSTD	 { int freebsd32_clock_settime(clockid_t clock_id, \
+233	AUE_CLOCK_SETTIME	STD	{ int freebsd32_clock_settime(clockid_t clock_id, \
 				    const struct timespec32 *tp); }
-234	AUE_NULL	MSTD	 { int freebsd32_clock_getres(clockid_t clock_id, \
+234	AUE_NULL	STD	{ int freebsd32_clock_getres(clockid_t clock_id, \
 				    struct timespec32 *tp); }
 235	AUE_NULL	UNIMPL	timer_create
 236	AUE_NULL	UNIMPL	timer_delete
 237	AUE_NULL	UNIMPL	timer_settime
 238	AUE_NULL	UNIMPL	timer_gettime
 239	AUE_NULL	UNIMPL	timer_getoverrun
-240	AUE_NULL	MSTD	{ int freebsd32_nanosleep( \
+240	AUE_NULL	STD	{ int freebsd32_nanosleep( \
 				    const struct timespec32 *rqtp, \
 				    struct timespec32 *rmtp); }
 241	AUE_NULL	UNIMPL	nosys
@@ -446,13 +442,13 @@
 248	AUE_NULL	UNIMPL	ntp_gettime
 249	AUE_NULL	UNIMPL	nosys
 ; syscall numbers initially used in OpenBSD
-250	AUE_MINHERIT	MNOPROTO { int minherit(void *addr, size_t len, \
+250	AUE_MINHERIT	NOPROTO	{ int minherit(void *addr, size_t len, \
 				    int inherit); }
-251	AUE_RFORK	MNOPROTO { int rfork(int flags); }
-252	AUE_POLL	MNOPROTO { int openbsd_poll(struct pollfd *fds, \
+251	AUE_RFORK	NOPROTO	{ int rfork(int flags); }
+252	AUE_POLL	NOPROTO	{ int openbsd_poll(struct pollfd *fds, \
 				    u_int nfds, int timeout); }
-253	AUE_ISSETUGID	MNOPROTO { int issetugid(void); }
-254	AUE_LCHOWN	MNOPROTO	{ int lchown(char *path, int uid, int gid); }
+253	AUE_ISSETUGID	NOPROTO	{ int issetugid(void); }
+254	AUE_LCHOWN	NOPROTO	{ int lchown(char *path, int uid, int gid); }
 255	AUE_NULL	UNIMPL	nosys
 256	AUE_NULL	UNIMPL	nosys
 257	AUE_NULL	UNIMPL	nosys
@@ -470,20 +466,20 @@
 269	AUE_NULL	UNIMPL	nosys
 270	AUE_NULL	UNIMPL	nosys
 271	AUE_NULL	UNIMPL	nosys
-272	AUE_O_GETDENTS	MNOPROTO	{ int getdents(int fd, char *buf, \
+272	AUE_O_GETDENTS	NOPROTO	{ int getdents(int fd, char *buf, \
 				    size_t count); }
 273	AUE_NULL	UNIMPL	nosys
-274	AUE_LCHMOD	MNOPROTO	{ int lchmod(char *path, mode_t mode); }
-275	AUE_LCHOWN	MNOPROTO { int lchown(char *path, uid_t uid, \
+274	AUE_LCHMOD	NOPROTO	{ int lchmod(char *path, mode_t mode); }
+275	AUE_LCHOWN	NOPROTO	{ int lchown(char *path, uid_t uid, \
 				    gid_t gid); } netbsd_lchown \
 				    lchown_args int
-276	AUE_LUTIMES	MSTD	{ int freebsd32_lutimes(char *path, \
+276	AUE_LUTIMES	STD	{ int freebsd32_lutimes(char *path, \
 				    struct timeval32 *tptr); }
-277	AUE_MSYNC	MNOPROTO { int msync(void *addr, size_t len, \
+277	AUE_MSYNC	NOPROTO	{ int msync(void *addr, size_t len, \
 				    int flags); } netbsd_msync msync_args int
-278	AUE_STAT	MNOPROTO	{ int nstat(char *path, struct nstat *ub); }
-279	AUE_FSTAT	MNOPROTO { int nfstat(int fd, struct nstat *sb); }
-280	AUE_LSTAT	MNOPROTO	{ int nlstat(char *path, struct nstat *ub); }
+278	AUE_STAT	NOPROTO	{ int nstat(char *path, struct nstat *ub); }
+279	AUE_FSTAT	NOPROTO	{ int nfstat(int fd, struct nstat *sb); }
+280	AUE_LSTAT	NOPROTO	{ int nlstat(char *path, struct nstat *ub); }
 281	AUE_NULL	UNIMPL	nosys
 282	AUE_NULL	UNIMPL	nosys
 283	AUE_NULL	UNIMPL	nosys
@@ -493,11 +489,11 @@
 287	AUE_NULL	UNIMPL	nosys
 288	AUE_NULL	UNIMPL	nosys
 ; 289 and 290 from NetBSD (OpenBSD: 267 and 268)
-289	AUE_PREADV	MSTD	{ ssize_t freebsd32_preadv(int fd, \
+289	AUE_PREADV	STD	{ ssize_t freebsd32_preadv(int fd, \
 					struct iovec32 *iovp, \
 					u_int iovcnt, off_t offset); }
 ; XXX note - bigendian is different
-290	AUE_PWRITEV	MSTD	{ ssize_t freebsd32_pwritev(int fd, \
+290	AUE_PWRITEV	STD	{ ssize_t freebsd32_pwritev(int fd, \
 					struct iovec32 *iovp, \
 					u_int iovcnt, off_t offset); }
 ; XXX note - bigendian is different
@@ -508,30 +504,30 @@
 295	AUE_NULL	UNIMPL	nosys
 296	AUE_NULL	UNIMPL	nosys
 ; XXX 297 is 300 in NetBSD 
-297	AUE_FHSTATFS	MCOMPAT4	{ int freebsd32_fhstatfs( \
+297	AUE_FHSTATFS	COMPAT4	{ int freebsd32_fhstatfs( \
 				    const struct fhandle *u_fhp, \
 				    struct statfs32 *buf); }
-298	AUE_FHOPEN	MNOPROTO	{ int fhopen(const struct fhandle *u_fhp, \
+298	AUE_FHOPEN	NOPROTO	{ int fhopen(const struct fhandle *u_fhp, \
 			 	    int flags); }
-299	AUE_FHSTAT	MNOPROTO	{ int fhstat(const struct fhandle *u_fhp, \
+299	AUE_FHSTAT	NOPROTO	{ int fhstat(const struct fhandle *u_fhp, \
 				    struct stat *sb); }
 ; syscall numbers for FreeBSD
-300	AUE_NULL	MNOPROTO { int modnext(int modid); }
-301	AUE_NULL	MSTD	{ int freebsd32_modstat(int modid, \
+300	AUE_NULL	NOPROTO	{ int modnext(int modid); }
+301	AUE_NULL	STD	{ int freebsd32_modstat(int modid, \
 				    struct module_stat32* stat); }
-302	AUE_NULL	MNOPROTO { int modfnext(int modid); }
-303	AUE_NULL	MNOPROTO { int modfind(const char *name); }
-304	AUE_MODLOAD	MNOPROTO { int kldload(const char *file); }
-305	AUE_MODUNLOAD	MNOPROTO { int kldunload(int fileid); }
-306	AUE_NULL	MNOPROTO { int kldfind(const char *file); }
-307	AUE_NULL	MNOPROTO { int kldnext(int fileid); }
-308	AUE_NULL	MNOPROTO { int kldstat(int fileid, \
+302	AUE_NULL	NOPROTO	{ int modfnext(int modid); }
+303	AUE_NULL	NOPROTO	{ int modfind(const char *name); }
+304	AUE_MODLOAD	NOPROTO	{ int kldload(const char *file); }
+305	AUE_MODUNLOAD	NOPROTO	{ int kldunload(int fileid); }
+306	AUE_NULL	NOPROTO	{ int kldfind(const char *file); }
+307	AUE_NULL	NOPROTO	{ int kldnext(int fileid); }
+308	AUE_NULL	NOPROTO	{ int kldstat(int fileid, \
 				    struct kld_file_stat* stat); }
-309	AUE_NULL	MNOPROTO { int kldfirstmod(int fileid); }
-310	AUE_GETSID	MNOPROTO { int getsid(pid_t pid); }
-311	AUE_SETRESUID	MNOPROTO { int setresuid(uid_t ruid, uid_t euid, \
+309	AUE_NULL	NOPROTO	{ int kldfirstmod(int fileid); }
+310	AUE_GETSID	NOPROTO	{ int getsid(pid_t pid); }
+311	AUE_SETRESUID	NOPROTO	{ int setresuid(uid_t ruid, uid_t euid, \
 				    uid_t suid); }
-312	AUE_SETRESGID	MNOPROTO { int setresgid(gid_t rgid, gid_t egid, \
+312	AUE_SETRESGID	NOPROTO	{ int setresgid(gid_t rgid, gid_t egid, \
 				    gid_t sgid); }
 313	AUE_NULL	OBSOL	signanosleep
 314	AUE_NULL	UNIMPL	aio_return
@@ -541,86 +537,86 @@
 318	AUE_NULL	UNIMPL	aio_read
 319	AUE_NULL	UNIMPL	aio_write
 320	AUE_NULL	UNIMPL	lio_listio
-321	AUE_NULL	MNOPROTO { int yield(void); }
+321	AUE_NULL	NOPROTO	{ int yield(void); }
 322	AUE_NULL	OBSOL	thr_sleep
 323	AUE_NULL	OBSOL	thr_wakeup
-324	AUE_MLOCKALL	MNOPROTO { int mlockall(int how); }
-325	AUE_MUNLOCKALL	MNOPROTO { int munlockall(void); }
-326	AUE_NULL	MNOPROTO	{ int __getcwd(u_char *buf, u_int buflen); }
+324	AUE_MLOCKALL	NOPROTO	{ int mlockall(int how); }
+325	AUE_MUNLOCKALL	NOPROTO	{ int munlockall(void); }
+326	AUE_NULL	NOPROTO	{ int __getcwd(u_char *buf, u_int buflen); }
 
-327	AUE_NULL	MNOPROTO { int sched_setparam (pid_t pid, \
+327	AUE_NULL	NOPROTO	{ int sched_setparam (pid_t pid, \
 				    const struct sched_param *param); }
-328	AUE_NULL	MNOPROTO { int sched_getparam (pid_t pid, \
+328	AUE_NULL	NOPROTO	{ int sched_getparam (pid_t pid, \
 				    struct sched_param *param); }
 
-329	AUE_NULL	MNOPROTO { int sched_setscheduler (pid_t pid, \
+329	AUE_NULL	NOPROTO	{ int sched_setscheduler (pid_t pid, \
 				    int policy, \
 				    const struct sched_param *param); }
-330	AUE_NULL	MNOPROTO { int sched_getscheduler (pid_t pid); }
+330	AUE_NULL	NOPROTO	{ int sched_getscheduler (pid_t pid); }
 
-331	AUE_NULL	MNOPROTO { int sched_yield (void); }
-332	AUE_NULL	MNOPROTO { int sched_get_priority_max (int policy); }
-333	AUE_NULL	MNOPROTO { int sched_get_priority_min (int policy); }
-334	AUE_NULL	MNOPROTO { int sched_rr_get_interval (pid_t pid, \
+331	AUE_NULL	NOPROTO	{ int sched_yield (void); }
+332	AUE_NULL	NOPROTO	{ int sched_get_priority_max (int policy); }
+333	AUE_NULL	NOPROTO	{ int sched_get_priority_min (int policy); }
+334	AUE_NULL	NOPROTO	{ int sched_rr_get_interval (pid_t pid, \
 				    struct timespec *interval); }
-335	AUE_NULL	MNOPROTO { int utrace(const void *addr, size_t len); }
+335	AUE_NULL	NOPROTO	{ int utrace(const void *addr, size_t len); }
 ; XXX note - bigendian is different
-336	AUE_SENDFILE	MCOMPAT4 { int freebsd32_sendfile(int fd, int s, \
+336	AUE_SENDFILE	COMPAT4	{ int freebsd32_sendfile(int fd, int s, \
 				    u_int32_t offsetlo, u_int32_t offsethi, \
 				    size_t nbytes, struct sf_hdtr32 *hdtr, \
 				    off_t *sbytes, int flags); }
-337	AUE_NULL	MNOPROTO	{ int kldsym(int fileid, int cmd, \
+337	AUE_NULL	NOPROTO	{ int kldsym(int fileid, int cmd, \
 				    void *data); }
-338	AUE_NULL	MNOPROTO { int jail(struct jail *jail); }
+338	AUE_NULL	NOPROTO	{ int jail(struct jail *jail); }
 339	AUE_NULL	UNIMPL	pioctl
-340	AUE_SIGPROCMASK	MNOPROTO { int sigprocmask(int how, \
+340	AUE_SIGPROCMASK	NOPROTO	{ int sigprocmask(int how, \
 				    const sigset_t *set, sigset_t *oset); }
-341	AUE_SIGSUSPEND	MNOPROTO { int sigsuspend(const sigset_t *sigmask); }
-342	AUE_SIGACTION	MCOMPAT4 { int freebsd32_sigaction(int sig, \
+341	AUE_SIGSUSPEND	NOPROTO	{ int sigsuspend(const sigset_t *sigmask); }
+342	AUE_SIGACTION	COMPAT4	{ int freebsd32_sigaction(int sig, \
 				    struct sigaction32 *act, \
 				    struct sigaction32 *oact); }
-343	AUE_SIGPENDING	MNOPROTO { int sigpending(sigset_t *set); }
-344	AUE_SIGRETURN	MCOMPAT4 { int freebsd32_sigreturn( \
+343	AUE_SIGPENDING	NOPROTO	{ int sigpending(sigset_t *set); }
+344	AUE_SIGRETURN	COMPAT4	{ int freebsd32_sigreturn( \
 		    const struct freebsd4_freebsd32_ucontext *sigcntxp); }
 ; XXX implement
 345	AUE_NULL	UNIMPL	sigtimedwait
 ; XXX implement
 346	AUE_NULL	UNIMPL	sigwaitinfo
-347	AUE_JAIL	MNOPROTO { int __acl_get_file(const char *path, \
+347	AUE_JAIL	NOPROTO	{ int __acl_get_file(const char *path, \
 				    acl_type_t type, struct acl *aclp); }
-348	AUE_NULL	MNOPROTO { int __acl_set_file(const char *path, \
+348	AUE_NULL	NOPROTO	{ int __acl_set_file(const char *path, \
 				    acl_type_t type, struct acl *aclp); }
-349	AUE_NULL	MNOPROTO { int __acl_get_fd(int filedes, \
+349	AUE_NULL	NOPROTO	{ int __acl_get_fd(int filedes, \
 				    acl_type_t type, struct acl *aclp); }
-350	AUE_NULL	MNOPROTO { int __acl_set_fd(int filedes, \
+350	AUE_NULL	NOPROTO	{ int __acl_set_fd(int filedes, \
 				    acl_type_t type, struct acl *aclp); }
-351	AUE_NULL	MNOPROTO { int __acl_delete_file(const char *path, \
+351	AUE_NULL	NOPROTO	{ int __acl_delete_file(const char *path, \
 				    acl_type_t type); }
-352	AUE_NULL	MNOPROTO { int __acl_delete_fd(int filedes, \
+352	AUE_NULL	NOPROTO	{ int __acl_delete_fd(int filedes, \
 				    acl_type_t type); }
-353	AUE_NULL	MNOPROTO { int __acl_aclcheck_file(const char *path, \
+353	AUE_NULL	NOPROTO	{ int __acl_aclcheck_file(const char *path, \
 				    acl_type_t type, struct acl *aclp); }
-354	AUE_NULL	MNOPROTO { int __acl_aclcheck_fd(int filedes, \
+354	AUE_NULL	NOPROTO	{ int __acl_aclcheck_fd(int filedes, \
 				    acl_type_t type, struct acl *aclp); }
-355	AUE_NULL	MNOPROTO	{ int extattrctl(const char *path, int cmd, \
+355	AUE_NULL	NOPROTO	{ int extattrctl(const char *path, int cmd, \
 				    const char *filename, int attrnamespace, \
 				    const char *attrname); }
-356	AUE_NULL	MNOPROTO	{ int extattr_set_file(const char *path, \
+356	AUE_NULL	NOPROTO	{ int extattr_set_file(const char *path, \
 				    int attrnamespace, const char *attrname, \
 				    void *data, size_t nbytes); }
-357	AUE_NULL	MNOPROTO	{ ssize_t extattr_get_file(const char *path, \
+357	AUE_NULL	NOPROTO	{ ssize_t extattr_get_file(const char *path, \
 				    int attrnamespace, const char *attrname, \
 				    void *data, size_t nbytes); }
-358	AUE_NULL	MNOPROTO	{ int extattr_delete_file(const char *path, \
+358	AUE_NULL	NOPROTO	{ int extattr_delete_file(const char *path, \
 				    int attrnamespace, \
 				    const char *attrname); }
 359	AUE_NULL	UNIMPL	aio_waitcomplete
-360	AUE_NULL	MNOPROTO { int getresuid(uid_t *ruid, uid_t *euid, \
+360	AUE_NULL	NOPROTO	{ int getresuid(uid_t *ruid, uid_t *euid, \
 				    uid_t *suid); }
-361	AUE_NULL	MNOPROTO { int getresgid(gid_t *rgid, gid_t *egid, \
+361	AUE_NULL	NOPROTO	{ int getresgid(gid_t *rgid, gid_t *egid, \
 				    gid_t *sgid); }
-362	AUE_NULL	MNOPROTO { int kqueue(void); }
-363	AUE_NULL	MSTD { int freebsd32_kevent(int fd, \
+362	AUE_NULL	NOPROTO	{ int kqueue(void); }
+363	AUE_NULL	STD	{ int freebsd32_kevent(int fd, \
 				    const struct kevent32 *changelist, \
 				    int nchanges, \
 				    struct kevent32 *eventlist, int nevents, \
@@ -632,50 +628,50 @@
 368	AUE_NULL	UNIMPL	__cap_set_fd
 369	AUE_NULL	UNIMPL	__cap_set_file
 370	AUE_NULL	UNIMPL	lkmressys
-371	AUE_NULL	MNOPROTO	{ int extattr_set_fd(int fd, \
+371	AUE_NULL	NOPROTO	{ int extattr_set_fd(int fd, \
 				    int attrnamespace, const char *attrname, \
 				    void *data, size_t nbytes); }
-372	AUE_NULL	MNOPROTO	{ ssize_t extattr_get_fd(int fd, \
+372	AUE_NULL	NOPROTO	{ ssize_t extattr_get_fd(int fd, \
 				    int attrnamespace, const char *attrname, \
 				    void *data, size_t nbytes); }
-373	AUE_NULL	MNOPROTO	{ int extattr_delete_fd(int fd, \
+373	AUE_NULL	NOPROTO	{ int extattr_delete_fd(int fd, \
 				    int attrnamespace, \
 				    const char *attrname); }
-374	AUE_NULL	MNOPROTO { int __setugid(int flag); }
+374	AUE_NULL	NOPROTO	{ int __setugid(int flag); }
 375	AUE_NULL	UNIMPL	nfsclnt
-376	AUE_NULL	MNOPROTO	{ int eaccess(char *path, int flags); }
+376	AUE_NULL	NOPROTO	{ int eaccess(char *path, int flags); }
 377	AUE_NULL	UNIMPL	afs_syscall
-378	AUE_NULL	MNOPROTO { int nmount(struct iovec *iovp, \
+378	AUE_NULL	NOPROTO	{ int nmount(struct iovec *iovp, \
 				    unsigned int iovcnt, int flags); }
-379	AUE_NULL	MNOPROTO	{ int kse_exit(void); }
-380	AUE_NULL	MNOPROTO	{ int kse_wakeup(struct kse_mailbox *mbx); }
-381	AUE_NULL	MNOPROTO	{ int kse_create(struct kse_mailbox *mbx, \
+379	AUE_NULL	NOPROTO	{ int kse_exit(void); }
+380	AUE_NULL	NOPROTO	{ int kse_wakeup(struct kse_mailbox *mbx); }
+381	AUE_NULL	NOPROTO	{ int kse_create(struct kse_mailbox *mbx, \
 				    int newgroup); }
-382	AUE_NULL	MNOPROTO	{ int kse_thr_interrupt( \
+382	AUE_NULL	NOPROTO	{ int kse_thr_interrupt( \
 				    struct kse_thr_mailbox *tmbx); }
-383	AUE_NULL	MNOPROTO	{ int kse_release(void); }
+383	AUE_NULL	NOPROTO	{ int kse_release(void); }
 384	AUE_NULL	UNIMPL	__mac_get_proc
 385	AUE_NULL	UNIMPL	__mac_set_proc
 386	AUE_NULL	UNIMPL	__mac_get_fd
 387	AUE_NULL	UNIMPL	__mac_get_file
 388	AUE_NULL	UNIMPL	__mac_set_fd
 389	AUE_NULL	UNIMPL	__mac_set_file
-390	AUE_NULL	MNOPROTO	{ int kenv(int what, const char *name, \
+390	AUE_NULL	NOPROTO	{ int kenv(int what, const char *name, \
 				    char *value, int len); }
-391	AUE_LCHFLAGS	MNOPROTO	{ int lchflags(const char *path, int flags); }
-392	AUE_NULL	MNOPROTO { int uuidgen(struct uuid *store, \
+391	AUE_LCHFLAGS	NOPROTO	{ int lchflags(const char *path, int flags); }
+392	AUE_NULL	NOPROTO	{ int uuidgen(struct uuid *store, \
 				    int count); }
-393	AUE_NULL	MSTD	{ int freebsd32_sendfile(int fd, int s, \
+393	AUE_NULL	STD	{ int freebsd32_sendfile(int fd, int s, \
 				    u_int32_t offsetlo, u_int32_t offsethi, \
 				    size_t nbytes, struct sf_hdtr32 *hdtr, \
 				    off_t *sbytes, int flags); }
 394	AUE_NULL	UNIMPL	mac_syscall
-395	AUE_GETFSSTAT	MNOPROTO	{ int getfsstat(struct statfs *buf, \
+395	AUE_GETFSSTAT	NOPROTO	{ int getfsstat(struct statfs *buf, \
 				    long bufsize, int flags); }
-396	AUE_STATFS	MNOPROTO	{ int statfs(char *path, \
+396	AUE_STATFS	NOPROTO	{ int statfs(char *path, \
 				    struct statfs *buf); }
-397	AUE_FSTATFS	MNOPROTO	{ int fstatfs(int fd, struct statfs *buf); }
-398	AUE_NULL	MNOPROTO	{ int fhstatfs(const struct fhandle *u_fhp, \
+397	AUE_FSTATFS	NOPROTO	{ int fstatfs(int fd, struct statfs *buf); }
+398	AUE_NULL	NOPROTO	{ int fhstatfs(const struct fhandle *u_fhp, \
 				    struct statfs *buf); }
 399	AUE_NULL	UNIMPL	nosys
 ; XXX implement these?
@@ -695,19 +691,19 @@
 413	AUE_NULL	UNIMPL	extattr_get_link
 414	AUE_NULL	UNIMPL	extattr_delete_link
 415	AUE_NULL	UNIMPL	__mac_execve
-416	AUE_SIGACTION	MSTD { int freebsd32_sigaction(int sig, \
+416	AUE_SIGACTION	STD	{ int freebsd32_sigaction(int sig, \
 				    struct sigaction32 *act, \
 				    struct sigaction32 *oact); }
-417	AUE_SIGRETURN	MSTD { int freebsd32_sigreturn( \
+417	AUE_SIGRETURN	STD	{ int freebsd32_sigreturn( \
 		    const struct freebsd32_ucontext *sigcntxp); }
 418	AUE_NULL	UNIMPL	__xstat
 419	AUE_NULL	UNIMPL	__xfstat
 420	AUE_NULL	UNIMPL	__xlstat
-421	AUE_NULL	MSTD	{ int freebsd32_getcontext( \
+421	AUE_NULL	STD	{ int freebsd32_getcontext( \
 				    struct freebsd32_ucontext *ucp); }
-422	AUE_NULL	MSTD	{ int freebsd32_setcontext( \
+422	AUE_NULL	STD	{ int freebsd32_setcontext( \
 				    const struct freebsd32_ucontext *ucp); }
-423	AUE_NULL	MSTD	{ int freebsd32_swapcontext( \
+423	AUE_NULL	STD	{ int freebsd32_swapcontext( \
 				    struct freebsd32_ucontext *oucp, \
 				    const struct freebsd32_ucontext *ucp); }
 424	AUE_SWAPOFF	UNIMPL	swapoff
@@ -717,23 +713,23 @@
 428	AUE_NULL	UNIMPL	__acl_aclcheck_link
 ; XXX implement
 429	AUE_SIGWAIT	UNIMPL	sigwait
-430	AUE_NULL	MNOPROTO { int thr_create(ucontext_t *ctx, long *id, \
+430	AUE_NULL	NOPROTO	{ int thr_create(ucontext_t *ctx, long *id, \
 				    int flag s); }
-431	AUE_NULL	MNOPROTO { void thr_exit(long *state); }
-432	AUE_NULL	MNOPROTO { int thr_self(long *id); }
-433	AUE_NULL	MNOPROTO { int thr_kill(long id, int sig); }
-434	AUE_NULL	MNOPROTO { int _umtx_lock(struct umtx *umtx); }
-435	AUE_NULL	MNOPROTO { int _umtx_unlock(struct umtx *umtx); }
-436	AUE_NULL	MNOPROTO { int jail_attach(int jid); }
+431	AUE_NULL	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); }
+434	AUE_NULL	NOPROTO	{ int _umtx_lock(struct umtx *umtx); }
+435	AUE_NULL	NOPROTO	{ int _umtx_unlock(struct umtx *umtx); }
+436	AUE_NULL	NOPROTO	{ int jail_attach(int jid); }
 437	AUE_NULL	UNIMPL	extattr_list_fd
 438	AUE_NULL	UNIMPL	extattr_list_file
 439	AUE_NULL	UNIMPL	extattr_list_link
 440	AUE_NULL	UNIMPL	kse_switchin
 441	AUE_NULL	UNIMPL	ksem_timedwait
-442	AUE_NULL	MNOPROTO { int thr_suspend( \
+442	AUE_NULL	NOPROTO	{ int thr_suspend( \
 				    const struct timespec *timeout); }
-443	AUE_NULL	MNOPROTO { int thr_wake(long id); }
-444	AUE_NULL	MNOPROTO { int kldunloadf(int fileid, int flags); }
+443	AUE_NULL	NOPROTO	{ int thr_wake(long id); }
+444	AUE_NULL	NOPROTO	{ int kldunloadf(int fileid, int flags); }
 445	AUE_AUDIT	UNIMPL	audit
 446	AUE_AUDITON	UNIMPL	auditon
 447	AUE_GETAUID	UNIMPL	getauid
@@ -752,7 +748,7 @@
 460	AUE_NULL	UNIMPL  kmq_timedsend
 461	AUE_NULL	UNIMPL	kmq_notify
 462	AUE_NULL	UNIMPL	kmq_unlink
-463	AUE_NULL	MNOPROTO { int abort2(const char *why, int nargs, void **args); }
+463	AUE_NULL	NOPROTO	{ int abort2(const char *why, int nargs, void **args); }
 464	AUE_NULL	UNIMPL	thr_set_name
 465	AUE_NULL	UNIMPL	aio_fsync
 466	AUE_NULL	UNIMPL	thr_setscheduler
diff --git a/sys/compat/svr4/syscalls.master b/sys/compat/svr4/syscalls.master
index 58ae297..0a88a45 100644
--- a/sys/compat/svr4/syscalls.master
+++ b/sys/compat/svr4/syscalls.master
@@ -39,85 +39,85 @@
 #include <compat/svr4/svr4_proto.h>
 
 0	AUE_NULL	UNIMPL	unused
-1	AUE_NULL	MNOPROTO	{ void sys_exit(int rval); } exit \
+1	AUE_NULL	NOPROTO	{ void sys_exit(int rval); } exit \
 				    sys_exit_args void
-2	AUE_NULL	MNOPROTO { int fork(void); }
-3	AUE_NULL	MNOPROTO { int read(int fd, char *buf, u_int nbyte); }
-4	AUE_NULL	MNOPROTO { int write(int fd, char *buf, u_int nbyte); }
-5	AUE_NULL	MSTD	{ int svr4_sys_open(char *path, int flags, \
+2	AUE_NULL	NOPROTO	{ int fork(void); }
+3	AUE_NULL	NOPROTO	{ int read(int fd, char *buf, u_int nbyte); }
+4	AUE_NULL	NOPROTO	{ int write(int fd, char *buf, u_int nbyte); }
+5	AUE_NULL	STD	{ int svr4_sys_open(char *path, int flags, \
 				    int mode); }
-6	AUE_NULL	MNOPROTO { int close(int fd); }
-7	AUE_NULL	MSTD	{ int svr4_sys_wait(int *status); }
-8	AUE_NULL	MSTD	{ int svr4_sys_creat(char *path, int mode); }
-9	AUE_NULL	MNOPROTO	{ int link(char *path, char *link); }
-10	AUE_NULL	MNOPROTO	{ int unlink(char *path); }
-11	AUE_NULL	MSTD	{ int svr4_sys_execv(char *path, char **argp); }
-12	AUE_NULL	MNOPROTO	{ int chdir(char *path); }
-13	AUE_NULL	MSTD	{ int svr4_sys_time(time_t *t); }
-14	AUE_NULL	MSTD	{ int svr4_sys_mknod(char* path, int mode, int dev); }
-15	AUE_NULL	MNOPROTO	{ int chmod(char *path, int mode); }
-16	AUE_NULL	MNOPROTO	{ int chown(char *path, uid_t uid, gid_t gid); }
-17	AUE_NULL	MSTD	{ int svr4_sys_break(caddr_t nsize); }
-18	AUE_NULL	MSTD	{ int svr4_sys_stat(char* path, \
+6	AUE_NULL	NOPROTO	{ int close(int fd); }
+7	AUE_NULL	STD	{ int svr4_sys_wait(int *status); }
+8	AUE_NULL	STD	{ int svr4_sys_creat(char *path, int mode); }
+9	AUE_NULL	NOPROTO	{ int link(char *path, char *link); }
+10	AUE_NULL	NOPROTO	{ int unlink(char *path); }
+11	AUE_NULL	STD	{ int svr4_sys_execv(char *path, char **argp); }
+12	AUE_NULL	NOPROTO	{ int chdir(char *path); }
+13	AUE_NULL	STD	{ int svr4_sys_time(time_t *t); }
+14	AUE_NULL	STD	{ int svr4_sys_mknod(char* path, int mode, int dev); }
+15	AUE_NULL	NOPROTO	{ int chmod(char *path, int mode); }
+16	AUE_NULL	NOPROTO	{ int chown(char *path, uid_t uid, gid_t gid); }
+17	AUE_NULL	STD	{ int svr4_sys_break(caddr_t nsize); }
+18	AUE_NULL	STD	{ int svr4_sys_stat(char* path, \
 				    struct svr4_stat* ub); }
-19	AUE_NULL	MNOPROTO	{ int lseek(int filedes, off_t *offset, \
+19	AUE_NULL	NOPROTO	{ int lseek(int filedes, off_t *offset, \
 				    int whence); }
-20	AUE_NULL	MNOPROTO { pid_t getpid(void); }
+20	AUE_NULL	NOPROTO	{ pid_t getpid(void); }
 21	AUE_NULL	UNIMPL	old_mount
 22	AUE_NULL	UNIMPL	sysv_umount
-23	AUE_NULL	MNOPROTO { int setuid(uid_t uid); }
-24	AUE_NULL	MNOPROTO { uid_t getuid(void); }
+23	AUE_NULL	NOPROTO	{ int setuid(uid_t uid); }
+24	AUE_NULL	NOPROTO	{ uid_t getuid(void); }
 25	AUE_NULL	UNIMPL	stime
 26	AUE_NULL	UNIMPL	ptrace
-27	AUE_NULL	MSTD	{ int svr4_sys_alarm(unsigned sec); }
-28	AUE_NULL	MSTD	{ int svr4_sys_fstat(int fd, \
+27	AUE_NULL	STD	{ int svr4_sys_alarm(unsigned sec); }
+28	AUE_NULL	STD	{ int svr4_sys_fstat(int fd, \
 				    struct svr4_stat *sb); }
-29	AUE_NULL	MSTD	{ int svr4_sys_pause(void); }
-30	AUE_NULL	MSTD	{ int svr4_sys_utime(char *path, \
+29	AUE_NULL	STD	{ int svr4_sys_pause(void); }
+30	AUE_NULL	STD	{ int svr4_sys_utime(char *path, \
 				    struct svr4_utimbuf *ubuf); }
 31	AUE_NULL	UNIMPL	stty
 32	AUE_NULL	UNIMPL	gtty
-33	AUE_NULL	MSTD	{ int svr4_sys_access(char *path, \
+33	AUE_NULL	STD	{ int svr4_sys_access(char *path, \
 				    int flags); }
-34	AUE_NULL	MSTD	{ int svr4_sys_nice(int prio); }
+34	AUE_NULL	STD	{ int svr4_sys_nice(int prio); }
 35	AUE_NULL	UNIMPL	statfs
-36	AUE_NULL	MNOPROTO	{ int sync(void); }
-37	AUE_NULL	MSTD	{ int svr4_sys_kill(int pid, int signum); }
+36	AUE_NULL	NOPROTO	{ int sync(void); }
+37	AUE_NULL	STD	{ int svr4_sys_kill(int pid, int signum); }
 38	AUE_NULL	UNIMPL	fstatfs
-39	AUE_NULL	MSTD	{ int svr4_sys_pgrpsys(int cmd, int pid, \
+39	AUE_NULL	STD	{ int svr4_sys_pgrpsys(int cmd, int pid, \
 				    int pgid); }
 40	AUE_NULL	UNIMPL	xenix
-41	AUE_NULL	MNOPROTO { int dup(u_int fd); }
-42	AUE_NULL	MNOPROTO { int pipe(void); }
-43	AUE_NULL	MSTD	{ int svr4_sys_times(struct tms *tp); }
+41	AUE_NULL	NOPROTO	{ int dup(u_int fd); }
+42	AUE_NULL	NOPROTO	{ int pipe(void); }
+43	AUE_NULL	STD	{ int svr4_sys_times(struct tms *tp); }
 44	AUE_NULL	UNIMPL	profil
 45	AUE_NULL	UNIMPL	plock
-46	AUE_NULL	MNOPROTO { int setgid(gid_t gid); }
-47	AUE_NULL	MNOPROTO { gid_t getgid(void); }
-48	AUE_NULL	MSTD	{ int svr4_sys_signal(int signum, \
+46	AUE_NULL	NOPROTO	{ int setgid(gid_t gid); }
+47	AUE_NULL	NOPROTO	{ gid_t getgid(void); }
+48	AUE_NULL	STD	{ int svr4_sys_signal(int signum, \
 				    svr4_sig_t handler); }
-49	AUE_NULL	MSTD	{ int svr4_sys_msgsys(int what, int a2, \
+49	AUE_NULL	STD	{ int svr4_sys_msgsys(int what, int a2, \
 				    int a3, int a4, int a5); }
-50	AUE_NULL	MSTD	{ int svr4_sys_sysarch(int op, void *a1); }
+50	AUE_NULL	STD	{ int svr4_sys_sysarch(int op, void *a1); }
 51	AUE_NULL	UNIMPL	acct
-52	AUE_NULL	MSTD	{ int svr4_sys_shmsys(int what, int a2, \
+52	AUE_NULL	STD	{ int svr4_sys_shmsys(int what, int a2, \
 				    int a3, int a4, int a5); }
-53	AUE_NULL	MSTD	{ int svr4_sys_semsys(int what, int a2, \
+53	AUE_NULL	STD	{ int svr4_sys_semsys(int what, int a2, \
 				    int a3, int a4, int a5); }
-54	AUE_NULL	MSTD	{ int svr4_sys_ioctl(int fd, u_long com, \
+54	AUE_NULL	STD	{ int svr4_sys_ioctl(int fd, u_long com, \
 				    caddr_t data); }
 55	AUE_NULL	UNIMPL	uadmin
 56	AUE_NULL	UNIMPL	exch
-57	AUE_NULL	MSTD	{ int svr4_sys_utssys(void *a1, void *a2, \
+57	AUE_NULL	STD	{ int svr4_sys_utssys(void *a1, void *a2, \
 				    int sel, void *a3); }
-58	AUE_NULL	MNOPROTO	{ int fsync(int fd); }
-59	AUE_NULL	MSTD	{ int svr4_sys_execve(char *path, \
+58	AUE_NULL	NOPROTO	{ int fsync(int fd); }
+59	AUE_NULL	STD	{ int svr4_sys_execve(char *path, \
 				    char **argp, char **envp); }
-60	AUE_NULL	MNOPROTO { int umask(int newmask); }
-61	AUE_NULL	MNOPROTO	{ int chroot(char *path); }
-62	AUE_NULL	MSTD	{ int svr4_sys_fcntl(int fd, int cmd, \
+60	AUE_NULL	NOPROTO	{ int umask(int newmask); }
+61	AUE_NULL	NOPROTO	{ int chroot(char *path); }
+62	AUE_NULL	STD	{ int svr4_sys_fcntl(int fd, int cmd, \
 				    char *arg); }
-63	AUE_NULL	MSTD	{ int svr4_sys_ulimit(int cmd, \
+63	AUE_NULL	STD	{ int svr4_sys_ulimit(int cmd, \
 				    long newlimit); }
 64	AUE_NULL	UNIMPL	reserved
 65	AUE_NULL	UNIMPL	reserved
@@ -134,113 +134,113 @@
 76	AUE_NULL	UNIMPL	rdebug
 77	AUE_NULL	UNIMPL	rfstop
 78	AUE_NULL	UNIMPL	rfsys
-79	AUE_NULL	MNOPROTO	{ int rmdir(char *path); }
-80	AUE_NULL	MNOPROTO	{ int mkdir(char *path, int mode); }
-81	AUE_NULL	MSTD	{ int svr4_sys_getdents(int fd, char *buf, \
+79	AUE_NULL	NOPROTO	{ int rmdir(char *path); }
+80	AUE_NULL	NOPROTO	{ int mkdir(char *path, int mode); }
+81	AUE_NULL	STD	{ int svr4_sys_getdents(int fd, char *buf, \
 				    int nbytes); }
 82	AUE_NULL	UNIMPL	libattach
 83	AUE_NULL	UNIMPL	libdetach
 84	AUE_NULL	UNIMPL	sysfs
-85	AUE_NULL	MSTD	{ int svr4_sys_getmsg(int fd, \
+85	AUE_NULL	STD	{ int svr4_sys_getmsg(int fd, \
 				    struct svr4_strbuf *ctl, \
 				    struct svr4_strbuf *dat, int *flags); }
-86	AUE_NULL	MSTD	{ int svr4_sys_putmsg(int fd, \
+86	AUE_NULL	STD	{ int svr4_sys_putmsg(int fd, \
 				    struct svr4_strbuf *ctl, \
 				    struct svr4_strbuf *dat, int flags); }
-87	AUE_NULL	MSTD	{ int svr4_sys_poll(struct pollfd *fds, \
+87	AUE_NULL	STD	{ int svr4_sys_poll(struct pollfd *fds, \
 				    unsigned int nfds, int timeout); }
-88	AUE_NULL	MSTD	{ int svr4_sys_lstat(char *path, \
+88	AUE_NULL	STD	{ int svr4_sys_lstat(char *path, \
 				    struct svr4_stat *ub); }
-89	AUE_NULL	MNOPROTO	{ int symlink(char *path, char *link); }
-90	AUE_NULL	MNOPROTO	{ int readlink(char *path, char *buf, \
+89	AUE_NULL	NOPROTO	{ int symlink(char *path, char *link); }
+90	AUE_NULL	NOPROTO	{ int readlink(char *path, char *buf, \
 				    int count); }
-91	AUE_NULL	MNOPROTO { int getgroups(u_int gidsetsize, \
+91	AUE_NULL	NOPROTO	{ int getgroups(u_int gidsetsize, \
 				    gid_t *gidset); }
-92	AUE_NULL	MNOPROTO { int setgroups(u_int gidsetsize, \
+92	AUE_NULL	NOPROTO	{ int setgroups(u_int gidsetsize, \
 				    gid_t *gidset); }
-93	AUE_NULL	MNOPROTO	{ int fchmod(int fd, int mode); }
-94	AUE_NULL	MNOPROTO	{ int fchown(int fd, int uid, int gid); }
-95	AUE_NULL	MSTD	{ int svr4_sys_sigprocmask(int how, \
+93	AUE_NULL	NOPROTO	{ int fchmod(int fd, int mode); }
+94	AUE_NULL	NOPROTO	{ int fchown(int fd, int uid, int gid); }
+95	AUE_NULL	STD	{ int svr4_sys_sigprocmask(int how, \
 				    svr4_sigset_t *set, \
 				    svr4_sigset_t *oset); }
-96	AUE_NULL	MSTD	{ int svr4_sys_sigsuspend( \
+96	AUE_NULL	STD	{ int svr4_sys_sigsuspend( \
 				    svr4_sigset_t *ss); }
-97	AUE_NULL	MSTD	{ int svr4_sys_sigaltstack( \
+97	AUE_NULL	STD	{ int svr4_sys_sigaltstack( \
 				    struct svr4_sigaltstack *nss, \
 				    struct svr4_sigaltstack *oss); }
-98	AUE_NULL	MSTD	{ int svr4_sys_sigaction(int signum, \
+98	AUE_NULL	STD	{ int svr4_sys_sigaction(int signum, \
 				    struct svr4_sigaction *nsa, \
 				    struct svr4_sigaction *osa); }
-99	AUE_NULL	MSTD	{ int svr4_sys_sigpending(int what, \
+99	AUE_NULL	STD	{ int svr4_sys_sigpending(int what, \
 				    svr4_sigset_t *mask); }
-100	AUE_NULL	MSTD	{ int svr4_sys_context(int func, \
+100	AUE_NULL	STD	{ int svr4_sys_context(int func, \
 				    struct svr4_ucontext *uc); }
 101	AUE_NULL	UNIMPL	evsys
 102	AUE_NULL	UNIMPL	evtrapret
-103	AUE_NULL	MSTD	{ int svr4_sys_statvfs(char *path, \
+103	AUE_NULL	STD	{ int svr4_sys_statvfs(char *path, \
 				    struct svr4_statvfs *fs); }
-104	AUE_NULL	MSTD	{ int svr4_sys_fstatvfs(int fd, \
+104	AUE_NULL	STD	{ int svr4_sys_fstatvfs(int fd, \
 				    struct svr4_statvfs *fs); }
 105	AUE_NULL	UNIMPL	whoknows
 106	AUE_NULL	UNIMPL	nfssvc
-107	AUE_NULL	MSTD	{ int svr4_sys_waitsys(int grp, int id, \
+107	AUE_NULL	STD	{ int svr4_sys_waitsys(int grp, int id, \
 				    union svr4_siginfo *info, int options); }
 108	AUE_NULL	UNIMPL	sigsendsys
-109	AUE_NULL	MSTD	{ int svr4_sys_hrtsys(int cmd, int fun, \
+109	AUE_NULL	STD	{ int svr4_sys_hrtsys(int cmd, int fun, \
 				    int sub, void *rv1, void *rv2); }
 110	AUE_NULL	UNIMPL	acancel
 111	AUE_NULL	UNIMPL	async
 112	AUE_NULL	UNIMPL	priocntlsys
-113	AUE_NULL	MSTD	{ int svr4_sys_pathconf(char *path, \
+113	AUE_NULL	STD	{ int svr4_sys_pathconf(char *path, \
 				    int name); }
 114	AUE_NULL	UNIMPL	mincore
-115	AUE_NULL	MSTD	{ caddr_t svr4_sys_mmap(caddr_t addr, \
+115	AUE_NULL	STD	{ caddr_t svr4_sys_mmap(caddr_t addr, \
 				    svr4_size_t len, int prot, int flags, \
 				    int fd, svr4_off_t pos); }
-116	AUE_NULL	MNOPROTO { int mprotect(void *addr, int len, \
+116	AUE_NULL	NOPROTO	{ int mprotect(void *addr, int len, \
 				    int prot); }
-117	AUE_NULL	MNOPROTO { int munmap(void *addr, int len); }
-118	AUE_NULL	MSTD	{ int svr4_sys_fpathconf(int fd, int name); }
-119	AUE_NULL	MNOPROTO { int vfork(void); }
-120	AUE_NULL	MNOPROTO	{ int fchdir(int fd); }
-121	AUE_NULL	MNOPROTO	{ int readv(int fd, struct iovec *iovp, \
+117	AUE_NULL	NOPROTO	{ int munmap(void *addr, int len); }
+118	AUE_NULL	STD	{ int svr4_sys_fpathconf(int fd, int name); }
+119	AUE_NULL	NOPROTO	{ int vfork(void); }
+120	AUE_NULL	NOPROTO	{ int fchdir(int fd); }
+121	AUE_NULL	NOPROTO	{ int readv(int fd, struct iovec *iovp, \
 				    u_int iovcnt); }
-122	AUE_NULL	MNOPROTO	{ int writev(int fd, struct iovec *iovp, \
+122	AUE_NULL	NOPROTO	{ int writev(int fd, struct iovec *iovp, \
 				    u_int iovcnt); }
-123	AUE_NULL	MSTD	{ int svr4_sys_xstat(int two, char *path, \
+123	AUE_NULL	STD	{ int svr4_sys_xstat(int two, char *path, \
 				    struct svr4_xstat *ub); }
-124	AUE_NULL	MSTD	{ int svr4_sys_lxstat(int two, char *path, \
+124	AUE_NULL	STD	{ int svr4_sys_lxstat(int two, char *path, \
 				    struct svr4_xstat *ub); }
-125	AUE_NULL	MSTD	{ int svr4_sys_fxstat(int two, int fd, \
+125	AUE_NULL	STD	{ int svr4_sys_fxstat(int two, int fd, \
 				    struct svr4_xstat *sb); }
-126	AUE_NULL	MSTD	{ int svr4_sys_xmknod(int two, char *path, \
+126	AUE_NULL	STD	{ int svr4_sys_xmknod(int two, char *path, \
 				    svr4_mode_t mode, svr4_dev_t dev); }
 127	AUE_NULL	UNIMPL	clocal
-128	AUE_NULL	MSTD	{ int svr4_sys_setrlimit(int which, \
+128	AUE_NULL	STD	{ int svr4_sys_setrlimit(int which, \
 				    const struct svr4_rlimit *rlp); }
-129	AUE_NULL	MSTD	{ int svr4_sys_getrlimit(int which, \
+129	AUE_NULL	STD	{ int svr4_sys_getrlimit(int which, \
 				    struct svr4_rlimit *rlp); }
-130	AUE_NULL	MNOPROTO	{ int lchown(char *path, uid_t uid, \
+130	AUE_NULL	NOPROTO	{ int lchown(char *path, uid_t uid, \
 				    gid_t gid); }
-131	AUE_NULL	MSTD	{ int svr4_sys_memcntl(void * addr, \
+131	AUE_NULL	STD	{ int svr4_sys_memcntl(void * addr, \
 				    svr4_size_t len, int cmd, void * arg, \
 				    int attr, int mask); }
 132	AUE_NULL	UNIMPL	getpmsg
 133	AUE_NULL	UNIMPL	putpmsg
-134	AUE_NULL	MNOPROTO	{ int rename(char *from, char *to); }
-135	AUE_NULL	MSTD	{ int svr4_sys_uname( \
+134	AUE_NULL	NOPROTO	{ int rename(char *from, char *to); }
+135	AUE_NULL	STD	{ int svr4_sys_uname( \
 				    struct svr4_utsname* name, int dummy); }
-136	AUE_NULL	MNOPROTO { int setegid(gid_t egid); }
-137	AUE_NULL	MSTD	{ int svr4_sys_sysconfig(int name); }
-138	AUE_NULL	MNOPROTO { int adjtime(struct timeval *delta, \
+136	AUE_NULL	NOPROTO	{ int setegid(gid_t egid); }
+137	AUE_NULL	STD	{ int svr4_sys_sysconfig(int name); }
+138	AUE_NULL	NOPROTO	{ int adjtime(struct timeval *delta, \
 				    struct timeval *olddelta); }
-139	AUE_NULL	MSTD	{ long svr4_sys_systeminfo(int what, \
+139	AUE_NULL	STD	{ long svr4_sys_systeminfo(int what, \
 				    char *buf, long len); }
 140	AUE_NULL	UNIMPL	notused
-141	AUE_NULL	MNOPROTO { int seteuid(uid_t euid); }
+141	AUE_NULL	NOPROTO	{ int seteuid(uid_t euid); }
 142	AUE_NULL	UNIMPL	vtrace
 ; fork1
-143	AUE_NULL	MUNIMPL { int fork(void); } 
+143	AUE_NULL	UNIMPL	{ int fork(void); } 
 144	AUE_NULL	UNIMPL	sigtimedwait
 145	AUE_NULL	UNIMPL	lwp_info
 146	AUE_NULL	UNIMPL	yield
@@ -250,15 +250,15 @@
 150	AUE_NULL	UNIMPL	notused
 151	AUE_NULL	UNIMPL	notused
 152	AUE_NULL	UNIMPL	modctl
-153	AUE_NULL	MSTD	{ int svr4_sys_fchroot(int fd); }
-154	AUE_NULL	MSTD	{ int svr4_sys_utimes(char *path, \
+153	AUE_NULL	STD	{ int svr4_sys_fchroot(int fd); }
+154	AUE_NULL	STD	{ int svr4_sys_utimes(char *path, \
 				    struct timeval *tptr); }
-155	AUE_NULL	MSTD	{ int svr4_sys_vhangup(void); }
-156	AUE_NULL	MSTD	{ int svr4_sys_gettimeofday( \
+155	AUE_NULL	STD	{ int svr4_sys_vhangup(void); }
+156	AUE_NULL	STD	{ int svr4_sys_gettimeofday( \
 				    struct timeval *tp); }
-157	AUE_NULL	MNOPROTO { int getitimer(u_int which, \
+157	AUE_NULL	NOPROTO	{ int getitimer(u_int which, \
 				    struct itimerval *itv); }
-158	AUE_NULL	MNOPROTO { int setitimer(u_int which, \
+158	AUE_NULL	NOPROTO	{ int setitimer(u_int which, \
 				    struct itimerval *itv, \
 				    struct itimerval *oitv); }
 159	AUE_NULL	UNIMPL	lwp_create
@@ -280,7 +280,7 @@
 174	AUE_NULL	UNIMPL	{ ssize_t svr4_sys_pwrite(int fd, \
 				    const void *buf, size_t nbyte, \
 				    svr4_off_t off); }
-175	AUE_NULL	MSTD	{ svr4_off64_t svr4_sys_llseek(int fd, \
+175	AUE_NULL	STD	{ svr4_off64_t svr4_sys_llseek(int fd, \
 				    long offset1, long offset2, int whence); }
 176	AUE_NULL	UNIMPL	inst_sync
 177	AUE_NULL	UNIMPL	whoknows
@@ -291,9 +291,9 @@
 182	AUE_NULL	UNIMPL	whoknows
 183	AUE_NULL	UNIMPL	whoknows
 184	AUE_NULL	UNIMPL	tsolsys
-185	AUE_NULL	MSTD	{ int svr4_sys_acl(char *path, int cmd, \
+185	AUE_NULL	STD	{ int svr4_sys_acl(char *path, int cmd, \
 				    int num, struct svr4_aclent *buf); }
-186	AUE_NULL	MSTD	{ int svr4_sys_auditsys(int code, int a1, \
+186	AUE_NULL	STD	{ int svr4_sys_auditsys(int code, int a1, \
 				    int a2, int a3, int a4, int a5); }
 187	AUE_NULL	UNIMPL	processor_bind
 188	AUE_NULL	UNIMPL	processor_info
@@ -307,91 +307,91 @@
 196	AUE_NULL	UNIMPL	timer_settime
 197	AUE_NULL	UNIMPL	timer_gettime
 198	AUE_NULL	UNIMPL	timer_overrun
-199	AUE_NULL	MNOPROTO { int nanosleep( \
+199	AUE_NULL	NOPROTO	{ int nanosleep( \
 				    const struct timespec *rqtp, \
 				    struct timespec *rmtp); }
-200	AUE_NULL	MSTD	{ int svr4_sys_facl(int fd, int cmd, \
+200	AUE_NULL	STD	{ int svr4_sys_facl(int fd, int cmd, \
 				    int num, struct svr4_aclent *buf); }
 201	AUE_NULL	UNIMPL	door
-202	AUE_NULL	MNOPROTO { int setreuid(int ruid, int euid); }
-203	AUE_NULL	MNOPROTO { int setregid(int rgid, int egid); }
+202	AUE_NULL	NOPROTO	{ int setreuid(int ruid, int euid); }
+203	AUE_NULL	NOPROTO	{ int setregid(int rgid, int egid); }
 204	AUE_NULL	UNIMPL	install_utrap
 205	AUE_NULL	UNIMPL	signotify
 206	AUE_NULL	UNIMPL	schedctl
 207	AUE_NULL	UNIMPL	pset
 208	AUE_NULL	UNIMPL	whoknows
-209	AUE_NULL	MSTD	{ int svr4_sys_resolvepath(const char *path, \
+209	AUE_NULL	STD	{ int svr4_sys_resolvepath(const char *path, \
 				    char *buf, size_t bufsiz); }
 210	AUE_NULL	UNIMPL	signotifywait
 211	AUE_NULL	UNIMPL	lwp_sigredirect
 212	AUE_NULL	UNIMPL	lwp_alarm
-213	AUE_NULL	MSTD	{ int svr4_sys_getdents64(int fd, \
+213	AUE_NULL	STD	{ int svr4_sys_getdents64(int fd, \
 				    struct svr4_dirent64 *dp, int nbytes); }
 ;213	AUE_NULL	UNIMPL	getdents64
-214	AUE_NULL	MSTD	{ caddr_t svr4_sys_mmap64(void *addr, \
+214	AUE_NULL	STD	{ caddr_t svr4_sys_mmap64(void *addr, \
 				    svr4_size_t len, int prot, int flags, \
 				    int fd, svr4_off64_t pos); }
-215	AUE_NULL	MSTD	{ int svr4_sys_stat64(char *path, \
+215	AUE_NULL	STD	{ int svr4_sys_stat64(char *path, \
 				    struct svr4_stat64 *sb); }
-216	AUE_NULL	MSTD	{ int svr4_sys_lstat64(char *path, \
+216	AUE_NULL	STD	{ int svr4_sys_lstat64(char *path, \
 				    struct svr4_stat64 *sb); }
-217	AUE_NULL	MSTD	{ int svr4_sys_fstat64(int fd, \
+217	AUE_NULL	STD	{ int svr4_sys_fstat64(int fd, \
 				    struct svr4_stat64 *sb); }
-218	AUE_NULL	MSTD	{ int svr4_sys_statvfs64(char *path, \
+218	AUE_NULL	STD	{ int svr4_sys_statvfs64(char *path, \
 				    struct svr4_statvfs64 *fs); }
-219	AUE_NULL	MSTD	{ int svr4_sys_fstatvfs64(int fd, \
+219	AUE_NULL	STD	{ int svr4_sys_fstatvfs64(int fd, \
 				    struct svr4_statvfs64 *fs); }
-220	AUE_NULL	MSTD	{ int svr4_sys_setrlimit64(int which, \
+220	AUE_NULL	STD	{ int svr4_sys_setrlimit64(int which, \
 				    const struct svr4_rlimit64 *rlp); }
-221	AUE_NULL	MSTD	{ int svr4_sys_getrlimit64(int which, \
+221	AUE_NULL	STD	{ int svr4_sys_getrlimit64(int which, \
 				    struct svr4_rlimit64 *rlp); }
 222	AUE_NULL	UNIMPL	pread64
 223	AUE_NULL	UNIMPL	pwrite64
-224	AUE_NULL	MSTD	{ int svr4_sys_creat64(char *path, \
+224	AUE_NULL	STD	{ int svr4_sys_creat64(char *path, \
 				    int mode); }
-225	AUE_NULL	MSTD	{ int svr4_sys_open64(char *path, int flags, \
+225	AUE_NULL	STD	{ int svr4_sys_open64(char *path, int flags, \
 				    int mode); }
 226	AUE_NULL	UNIMPL	rpcsys
 227	AUE_NULL	UNIMPL	whoknows
 228	AUE_NULL	UNIMPL	whoknows
 229	AUE_NULL	UNIMPL	whoknows
-230	AUE_NULL	MSTD	{ int svr4_sys_socket(int domain, int type, \
+230	AUE_NULL	STD	{ int svr4_sys_socket(int domain, int type, \
 				    int protocol); }
-231	AUE_NULL	MNOPROTO	{ int socketpair(int domain, int type, \
+231	AUE_NULL	NOPROTO	{ int socketpair(int domain, int type, \
 				    int protocol, int *rsv); }
-232	AUE_NULL	MNOPROTO	{ int bind(int s, \
+232	AUE_NULL	NOPROTO	{ int bind(int s, \
 				    const struct sockaddr *name, \
 				    int namelen); }
-233	AUE_NULL	MNOPROTO	{ int listen(int s, int backlog); }
-234	AUE_NULL	MNOPROTO	{ int accept(int s, struct sockaddr *name, \
+233	AUE_NULL	NOPROTO	{ int listen(int s, int backlog); }
+234	AUE_NULL	NOPROTO	{ int accept(int s, struct sockaddr *name, \
 				    int *anamelen); }
-235	AUE_NULL	MNOPROTO	{ int connect(int s, \
+235	AUE_NULL	NOPROTO	{ int connect(int s, \
 				    const struct sockaddr *name, \
 				    int namelen); }
-236	AUE_NULL	MNOPROTO	{ int shutdown(int s, int how); }
-237	AUE_NULL	MSTD	{ int svr4_sys_recv(int s, caddr_t buf, \
+236	AUE_NULL	NOPROTO	{ int shutdown(int s, int how); }
+237	AUE_NULL	STD	{ int svr4_sys_recv(int s, caddr_t buf, \
 				    int len, int flags); }
-238	AUE_NULL	MNOPROTO	{ ssize_t recvfrom(int s, void *buf, \
+238	AUE_NULL	NOPROTO	{ ssize_t recvfrom(int s, void *buf, \
 				    size_t len, int flags, \
 				    struct sockaddr *from, \
 				    int *fromlenaddr); }
-239	AUE_NULL	MNOPROTO	{ ssize_t recvmsg(int s, struct msghdr *msg, \
+239	AUE_NULL	NOPROTO	{ ssize_t recvmsg(int s, struct msghdr *msg, \
 				    int flags); }
-240	AUE_NULL	MSTD	{ int svr4_sys_send(int s, caddr_t buf, \
+240	AUE_NULL	STD	{ int svr4_sys_send(int s, caddr_t buf, \
 				    int len, int flags); }
-241	AUE_NULL	MNOPROTO	{ ssize_t sendmsg(int s, \
+241	AUE_NULL	NOPROTO	{ ssize_t sendmsg(int s, \
 				    const struct msghdr *msg, int flags); }
-242	AUE_NULL	MSTD	{ ssize_t svr4_sys_sendto(int s, void *buf, \
+242	AUE_NULL	STD	{ ssize_t svr4_sys_sendto(int s, void *buf, \
 				    size_t len, int flags, \
 				    struct sockaddr *to, int tolen); }
-243	AUE_NULL	MNOPROTO	{ int getpeername(int fdes, \
+243	AUE_NULL	NOPROTO	{ int getpeername(int fdes, \
 				    struct sockaddr *asa, int *alen); }
-244	AUE_NULL	MNOPROTO	{ int getsockname(int fdes, \
+244	AUE_NULL	NOPROTO	{ int getsockname(int fdes, \
 				    struct sockaddr *asa, int *alen); }
-245	AUE_NULL	MNOPROTO	{ int getsockopt(int s, int level, int name, \
+245	AUE_NULL	NOPROTO	{ int getsockopt(int s, int level, int name, \
 				    void *val, int *avalsize); }
-246	AUE_NULL	MNOPROTO	{ int setsockopt(int s, int level, int name, \
+246	AUE_NULL	NOPROTO	{ int setsockopt(int s, int level, int name, \
 				    const void *val, int valsize); }
 247	AUE_NULL	UNIMPL	sockconfig
 248	AUE_NULL	UNIMPL	{ int ntp_gettime(struct ntptimeval *ntvp); }
-249	AUE_NULL	MUNIMPL	{ int ntp_adjtime(struct timex *tp); }
+249	AUE_NULL	UNIMPL	{ int ntp_adjtime(struct timex *tp); }