Make a pass through all the compat ABIs sychronizing the MP safe flags

with the master syscall table as well as marking several ABI wrapper
functions safe.

MFC after:	1 week

2 files changed, 164 insertions, 164 deletions

diff --git a/sys/compat/freebsd32/syscalls.master b/sys/compat/freebsd32/syscalls.master
index d861445..2a764bf 100644
--- a/sys/compat/freebsd32/syscalls.master
+++ b/sys/compat/freebsd32/syscalls.master
@@ -67,21 +67,21 @@
 9	AUE_NULL	MNOPROTO { int link(char *path, char *link); }
 10	AUE_NULL	MNOPROTO { int unlink(char *path); }
 11	AUE_NULL	OBSOL	execv
-12	AUE_NULL	NOPROTO	{ int chdir(char *path); }
-13	AUE_NULL	NOPROTO	{ int fchdir(int fd); }
-14	AUE_NULL	NOPROTO	{ int 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, int uid, int gid); }
+12	AUE_NULL	MNOPROTO	{ int chdir(char *path); }
+13	AUE_NULL	MNOPROTO	{ int fchdir(int fd); }
+14	AUE_NULL	MNOPROTO	{ int 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, int uid, int gid); }
 17	AUE_NULL	MNOPROTO { int obreak(char *nsize); } break \
 				    obreak_args int
-18	AUE_NULL	COMPAT4	{ int freebsd32_getfsstat( \
+18	AUE_NULL	MCOMPAT4	{ int freebsd32_getfsstat( \
 				    struct statfs32 *buf, long bufsize, \
 				    int flags); }
 19	AUE_NULL	OBSOL	olseek
 20	AUE_NULL	MNOPROTO { pid_t getpid(void); }
-21	AUE_NULL	MNOPROTO { int mount(char *type, char *path, \
+21	AUE_NULL	NOPROTO { int mount(char *type, char *path, \
 				    int flags, caddr_t data); }
-22	AUE_NULL	MNOPROTO { int unmount(char *path, int flags); }
+22	AUE_NULL	NOPROTO { int unmount(char *path, int flags); }
 23	AUE_NULL	MNOPROTO { int setuid(uid_t uid); }
 24	AUE_NULL	MNOPROTO { uid_t getuid(void); }
 25	AUE_NULL	MNOPROTO { uid_t geteuid(void); }
@@ -100,10 +100,10 @@
 				    int *alen); }
 32	AUE_NULL	MNOPROTO { int getsockname(int fdes, caddr_t asa, \
 				    int *alen); }
-33	AUE_NULL	NOPROTO	{ int access(char *path, int flags); }
-34	AUE_NULL	NOPROTO	{ int chflags(char *path, int flags); }
-35	AUE_NULL	NOPROTO	{ int fchflags(int fd, int flags); }
-36	AUE_NULL	NOPROTO	{ int sync(void); }
+33	AUE_NULL	MNOPROTO	{ int access(char *path, int flags); }
+34	AUE_NULL	MNOPROTO	{ int chflags(char *path, int flags); }
+35	AUE_NULL	MNOPROTO	{ int fchflags(int fd, int flags); }
+36	AUE_NULL	MNOPROTO	{ int sync(void); }
 37	AUE_NULL	MNOPROTO { int kill(int pid, int signum); }
 38	AUE_NULL	UNIMPL	ostat
 39	AUE_NULL	MNOPROTO { pid_t getppid(void); }
@@ -129,15 +129,15 @@
 54	AUE_NULL	MNOPROTO { int ioctl(int fd, u_long com, \
 				    caddr_t data); }
 55	AUE_NULL	MNOPROTO { int reboot(int opt); }
-56	AUE_NULL	NOPROTO	{ int revoke(char *path); }
-57	AUE_NULL	NOPROTO	{ int symlink(char *path, char *link); }
-58	AUE_NULL	NOPROTO	{ int readlink(char *path, char *buf, \
+56	AUE_NULL	MNOPROTO	{ int revoke(char *path); }
+57	AUE_NULL	MNOPROTO	{ int symlink(char *path, char *link); }
+58	AUE_NULL	MNOPROTO	{ int readlink(char *path, char *buf, \
 				    int count); }
-59	AUE_NULL	STD	 { int freebsd32_execve(char *fname, \
+59	AUE_NULL	MSTD	 { int freebsd32_execve(char *fname, \
 				    u_int32_t *argv, u_int32_t *envv); }
 60	AUE_NULL	MNOPROTO { int umask(int newmask); } umask \
 				    umask_args int
-61	AUE_NULL	NOPROTO	{ int chroot(char *path); }
+61	AUE_NULL	MNOPROTO	{ int chroot(char *path); }
 62	AUE_NULL	OBSOL	ofstat
 63	AUE_NULL	OBSOL	ogetkerninfo
 64	AUE_NULL	OBSOL	ogetpagesize
@@ -167,13 +167,13 @@
 				    gid_t *gidset); }
 81	AUE_NULL	MNOPROTO { int getpgrp(void); }
 82	AUE_NULL	MNOPROTO { int setpgid(int pid, int pgid); }
-83	AUE_NULL	STD	{ int freebsd32_setitimer(u_int which, \
+83	AUE_NULL	MSTD	{ int freebsd32_setitimer(u_int which, \
 				    struct itimerval32 *itv, \
 				    struct itimerval32 *oitv); }
 84	AUE_NULL	OBSOL	owait
 ; XXX implement
 85	AUE_NULL	OBSOL	oswapon
-86	AUE_NULL	STD	{ int freebsd32_getitimer(u_int which, \
+86	AUE_NULL	MSTD	{ int freebsd32_getitimer(u_int which, \
 				    struct itimerval32 *itv); }
 87	AUE_NULL	OBSOL	ogethostname
 88	AUE_NULL	OBSOL	osethostname
@@ -181,12 +181,12 @@
 90	AUE_NULL	MNOPROTO { int dup2(u_int from, u_int to); }
 91	AUE_NULL	UNIMPL	getdopt
 92	AUE_NULL	MNOPROTO { int fcntl(int fd, int cmd, long arg); }
-93	AUE_NULL	STD	{ int freebsd32_select(int nd, fd_set *in, \
+93	AUE_NULL	MSTD	{ 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_NULL	NOPROTO	{ int fsync(int fd); }
+95	AUE_NULL	MNOPROTO	{ int fsync(int fd); }
 96	AUE_NULL	MNOPROTO { int setpriority(int which, int who, \
 				    int prio); }
 97	AUE_NULL	MNOPROTO { int socket(int domain, int type, \
@@ -215,40 +215,40 @@
 116	AUE_NULL	MSTD	{ int freebsd32_gettimeofday( \
 				    struct timeval32 *tp, \
 				    struct timezone *tzp); }
-117	AUE_NULL	STD	{ int freebsd32_getrusage(int who, \
+117	AUE_NULL	MSTD	{ int freebsd32_getrusage(int who, \
 				    struct rusage32 *rusage); }
 118	AUE_NULL	MNOPROTO { int getsockopt(int s, int level, \
 				    int name, caddr_t val, int *avalsize); }
 119	AUE_NULL	UNIMPL	resuba (BSD/OS 2.x)
-120	AUE_NULL	STD	{ int freebsd32_readv(int fd, \
+120	AUE_NULL	MSTD	{ int freebsd32_readv(int fd, \
 				    struct iovec32 *iovp, u_int iovcnt); }
-121	AUE_NULL	STD	{ int freebsd32_writev(int fd, \
+121	AUE_NULL	MSTD	{ int freebsd32_writev(int fd, \
 				    struct iovec32 *iovp, u_int iovcnt); }
-122	AUE_NULL	STD	{ int freebsd32_settimeofday( \
+122	AUE_NULL	MSTD	{ int freebsd32_settimeofday( \
 				    struct timeval32 *tv, \
 				    struct timezone *tzp); }
-123	AUE_NULL	NOPROTO	{ int fchown(int fd, int uid, int gid); }
-124	AUE_NULL	NOPROTO	{ int fchmod(int fd, int mode); }
+123	AUE_NULL	MNOPROTO	{ int fchown(int fd, int uid, int gid); }
+124	AUE_NULL	MNOPROTO	{ int fchmod(int fd, int mode); }
 125	AUE_NULL	OBSOL	orecvfrom
 126	AUE_NULL	MNOPROTO { int setreuid(int ruid, int euid); }
 127	AUE_NULL	MNOPROTO { int setregid(int rgid, int egid); }
-128	AUE_NULL	NOPROTO	{ int rename(char *from, char *to); }
+128	AUE_NULL	MNOPROTO	{ int rename(char *from, char *to); }
 129	AUE_NULL	OBSOL	otruncate
 130	AUE_NULL	OBSOL	ftruncate
 131	AUE_NULL	MNOPROTO { int flock(int fd, int how); }
-132	AUE_NULL	NOPROTO	{ int mkfifo(char *path, int mode); }
+132	AUE_NULL	MNOPROTO	{ int mkfifo(char *path, int mode); }
 133	AUE_NULL	MNOPROTO { int sendto(int s, caddr_t buf, \
 				    size_t len, int flags, caddr_t to, \
 				    int tolen); }
 134	AUE_NULL	MNOPROTO { int shutdown(int s, int how); }
 135	AUE_NULL	MNOPROTO { int socketpair(int domain, int type, \
 				    int protocol, int *rsv); }
-136	AUE_NULL	NOPROTO	{ int mkdir(char *path, int mode); }
-137	AUE_NULL	NOPROTO	{ int rmdir(char *path); }
-138	AUE_NULL	STD	{ int freebsd32_utimes(char *path, \
+136	AUE_NULL	MNOPROTO	{ int mkdir(char *path, int mode); }
+137	AUE_NULL	MNOPROTO	{ int rmdir(char *path); }
+138	AUE_NULL	MSTD	{ int freebsd32_utimes(char *path, \
 				    struct timeval32 *tptr); }
 139	AUE_NULL	OBSOL	4.2 sigreturn
-140	AUE_NULL	STD	{ int freebsd32_adjtime( \
+140	AUE_NULL	MSTD	{ int freebsd32_adjtime( \
 				    struct timeval32 *delta, \
 				    struct timeval32 *olddelta); }
 141	AUE_NULL	OBSOL	ogetpeername
@@ -258,7 +258,7 @@
 145	AUE_NULL	OBSOL	setrlimit
 146	AUE_NULL	OBSOL	killpg
 147	AUE_NULL	MNOPROTO { int setsid(void); }
-148	AUE_NULL	NOPROTO	{ int quotactl(char *path, int cmd, int uid, \
+148	AUE_NULL	MNOPROTO	{ int quotactl(char *path, int cmd, int uid, \
 				    caddr_t arg); }
 149	AUE_NULL	OBSOL oquota
 150	AUE_NULL	OBSOL ogetsockname
@@ -275,13 +275,13 @@
 ; XXX this is a problem!!!
 155	AUE_NULL	UNIMPL	nfssvc
 156	AUE_NULL	OBSOL	ogetdirentries
-157	AUE_NULL	COMPAT4	{ int freebsd32_statfs(char *path, \
+157	AUE_NULL	MCOMPAT4	{ int freebsd32_statfs(char *path, \
 				    struct statfs32 *buf); }
-158	AUE_NULL	COMPAT4	{ int freebsd32_fstatfs(int fd, \
+158	AUE_NULL	MCOMPAT4	{ int freebsd32_fstatfs(int fd, \
 				    struct statfs32 *buf); }
 159	AUE_NULL	UNIMPL	nosys
 160	AUE_NULL	UNIMPL	nosys
-161	AUE_NULL	NOPROTO	{ int getfh(char *fname, \
+161	AUE_NULL	MNOPROTO	{ int getfh(char *fname, \
 				    struct fhandle *fhp); }
 162	AUE_NULL	MNOPROTO { int getdomainname(char *domainname, \
 				    int len); }
@@ -293,18 +293,18 @@
 				    struct rtprio *rtp); }
 167	AUE_NULL	UNIMPL	nosys
 168	AUE_NULL	UNIMPL	nosys
-169	AUE_NULL	STD	{ int freebsd32_semsys(int which, int a2, \
+169	AUE_NULL	MSTD	{ int freebsd32_semsys(int which, int a2, \
 				    int a3, int a4, int a5); }
-170	AUE_NULL	STD	{ int freebsd32_msgsys(int which, int a2, \
+170	AUE_NULL	MSTD	{ int freebsd32_msgsys(int which, int a2, \
 				    int a3, int a4, int a5, int a6); }
-171	AUE_NULL	STD	{ int freebsd32_shmsys(int which, int a2, \
+171	AUE_NULL	MSTD	{ int freebsd32_shmsys(int which, int a2, \
 				    int a3, int a4); }
 172	AUE_NULL	UNIMPL	nosys
-173	AUE_NULL	STD	{ ssize_t freebsd32_pread(int fd, void *buf, \
+173	AUE_NULL	MSTD	{ 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_NULL	STD	{ ssize_t freebsd32_pwrite(int fd, \
+174	AUE_NULL	MSTD	{ 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
@@ -323,13 +323,13 @@
 185	AUE_NULL	UNIMPL	lfs_markv
 186	AUE_NULL	UNIMPL	lfs_segclean
 187	AUE_NULL	UNIMPL	lfs_segwait
-188	AUE_NULL	STD	{ int freebsd32_stat(char *path, \
+188	AUE_NULL	MSTD	{ int freebsd32_stat(char *path, \
 				    struct stat32 *ub); }
 189	AUE_NULL	MSTD	{ int freebsd32_fstat(int fd, \
 				    struct stat32 *ub); }
-190	AUE_NULL	STD	{ int freebsd32_lstat(char *path, \
+190	AUE_NULL	MSTD	{ int freebsd32_lstat(char *path, \
 				    struct stat32 *ub); }
-191	AUE_NULL	NOPROTO	{ int pathconf(char *path, int name); }
+191	AUE_NULL	MNOPROTO	{ int pathconf(char *path, int name); }
 192	AUE_NULL	MNOPROTO { int fpathconf(int fd, int name); }
 193	AUE_NULL	UNIMPL	nosys
 194	AUE_NULL	MNOPROTO { int getrlimit(u_int which, \
@@ -338,24 +338,24 @@
 195	AUE_NULL	MNOPROTO { int setrlimit(u_int which, \
 				    struct rlimit *rlp); } setrlimit \
 				    __setrlimit_args int
-196	AUE_NULL	NOPROTO	{ int getdirentries(int fd, char *buf, \
+196	AUE_NULL	MNOPROTO	{ int getdirentries(int fd, char *buf, \
 				    u_int count, long *basep); }
-197	AUE_NULL	STD 	{ caddr_t freebsd32_mmap(caddr_t addr, \
+197	AUE_NULL	MSTD 	{ 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	NOPROTO	{ int nosys(void); } __syscall \
+198	AUE_NULL	MNOPROTO	{ int nosys(void); } __syscall \
 				    __syscall_args int
 ; XXX note - bigendian is different
-199	AUE_NULL	STD	{ off_t freebsd32_lseek(int fd, int pad, \
+199	AUE_NULL	MSTD	{ 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_NULL	STD	{ int freebsd32_truncate(char *path, \
+200	AUE_NULL	MSTD	{ int freebsd32_truncate(char *path, \
 				    int pad, u_int32_t lengthlo, \
 				    u_int32_t lengthhi); }
 ; XXX note - bigendian is different
-201	AUE_NULL	STD	{ int freebsd32_ftruncate(int fd, int pad, \
+201	AUE_NULL	MSTD	{ int freebsd32_ftruncate(int fd, int pad, \
 				    u_int32_t lengthlo, u_int32_t lengthhi); }
 202	AUE_NULL	MSTD	{ int freebsd32_sysctl(int *name, \
 				    u_int namelen, void *old, \
@@ -365,8 +365,8 @@
 				    size_t len); }
 204	AUE_NULL	MNOPROTO { int munlock(const void *addr, \
 				    size_t len); }
-205	AUE_NULL	NOPROTO	{ int undelete(char *path); }
-206	AUE_NULL	NOPROTO	{ int futimes(int fd, struct timeval *tptr); }
+205	AUE_NULL	MNOPROTO	{ int undelete(char *path); }
+206	AUE_NULL	MNOPROTO	{ int futimes(int fd, struct timeval *tptr); }
 207	AUE_NULL	MNOPROTO { int getpgid(pid_t pid); }
 208	AUE_NULL	UNIMPL	newreboot (NetBSD)
 209	AUE_NULL	MNOPROTO { int poll(struct pollfd *fds, u_int nfds, \
@@ -442,7 +442,7 @@
 252	AUE_NULL	MNOPROTO { int openbsd_poll(struct pollfd *fds, \
 				    u_int nfds, int timeout); }
 253	AUE_NULL	MNOPROTO { int issetugid(void); }
-254	AUE_NULL	NOPROTO	{ int lchown(char *path, int uid, int gid); }
+254	AUE_NULL	MNOPROTO	{ int lchown(char *path, int uid, int gid); }
 255	AUE_NULL	UNIMPL	nosys
 256	AUE_NULL	UNIMPL	nosys
 257	AUE_NULL	UNIMPL	nosys
@@ -460,20 +460,20 @@
 269	AUE_NULL	UNIMPL	nosys
 270	AUE_NULL	UNIMPL	nosys
 271	AUE_NULL	UNIMPL	nosys
-272	AUE_NULL	NOPROTO	{ int getdents(int fd, char *buf, \
+272	AUE_NULL	MNOPROTO	{ int getdents(int fd, char *buf, \
 				    size_t count); }
 273	AUE_NULL	UNIMPL	nosys
-274	AUE_NULL	NOPROTO	{ int lchmod(char *path, mode_t mode); }
-275	AUE_NULL	NOPROTO { int lchown(char *path, uid_t uid, \
+274	AUE_NULL	MNOPROTO	{ int lchmod(char *path, mode_t mode); }
+275	AUE_NULL	MNOPROTO { int lchown(char *path, uid_t uid, \
 				    gid_t gid); } netbsd_lchown \
 				    lchown_args int
-276	AUE_NULL	NOPROTO	{ int lutimes(char *path, \
+276	AUE_NULL	MNOPROTO	{ int lutimes(char *path, \
 				    struct timeval *tptr); }
 277	AUE_NULL	MNOPROTO { int msync(void *addr, size_t len, \
 				    int flags); } netbsd_msync msync_args int
-278	AUE_NULL	NOPROTO	{ int nstat(char *path, struct nstat *ub); }
+278	AUE_NULL	MNOPROTO	{ int nstat(char *path, struct nstat *ub); }
 279	AUE_NULL	MNOPROTO { int nfstat(int fd, struct nstat *sb); }
-280	AUE_NULL	NOPROTO	{ int nlstat(char *path, struct nstat *ub); }
+280	AUE_NULL	MNOPROTO	{ int nlstat(char *path, struct nstat *ub); }
 281	AUE_NULL	UNIMPL	nosys
 282	AUE_NULL	UNIMPL	nosys
 283	AUE_NULL	UNIMPL	nosys
@@ -498,12 +498,12 @@
 295	AUE_NULL	UNIMPL	nosys
 296	AUE_NULL	UNIMPL	nosys
 ; XXX 297 is 300 in NetBSD 
-297	AUE_NULL	COMPAT4	{ int freebsd32_fhstatfs( \
+297	AUE_NULL	MCOMPAT4	{ int freebsd32_fhstatfs( \
 				    const struct fhandle *u_fhp, \
 				    struct statfs32 *buf); }
-298	AUE_NULL	NOPROTO	{ int fhopen(const struct fhandle *u_fhp, \
+298	AUE_NULL	MNOPROTO	{ int fhopen(const struct fhandle *u_fhp, \
 			 	    int flags); }
-299	AUE_NULL	NOPROTO	{ int fhstat(const struct fhandle *u_fhp, \
+299	AUE_NULL	MNOPROTO	{ int fhstat(const struct fhandle *u_fhp, \
 				    struct stat *sb); }
 ; syscall numbers for FreeBSD
 300	AUE_NULL	MNOPROTO { int modnext(int modid); }
@@ -536,7 +536,7 @@
 323	AUE_NULL	OBSOL	thr_wakeup
 324	AUE_NULL	MNOPROTO { int mlockall(int how); }
 325	AUE_NULL	MNOPROTO { int munlockall(void); }
-326	AUE_NULL	NOPROTO	{ int __getcwd(u_char *buf, u_int buflen); }
+326	AUE_NULL	MNOPROTO	{ int __getcwd(u_char *buf, u_int buflen); }
 
 327	AUE_NULL	MNOPROTO { int sched_setparam (pid_t pid, \
 				    const struct sched_param *param); }
@@ -559,7 +559,7 @@
 				    u_int32_t offsetlo, u_int32_t offsethi, \
 				    size_t nbytes, struct sf_hdtr *hdtr, \
 				    off_t *sbytes, int flags); }
-337	AUE_NULL	NOPROTO	{ int kldsym(int fileid, int cmd, \
+337	AUE_NULL	MNOPROTO	{ int kldsym(int fileid, int cmd, \
 				    void *data); }
 338	AUE_NULL	MNOPROTO { int jail(struct jail *jail); }
 339	AUE_NULL	UNIMPL	pioctl
@@ -633,26 +633,26 @@
 				    const char *attrname); }
 374	AUE_NULL	MNOPROTO { int __setugid(int flag); }
 375	AUE_NULL	UNIMPL	nfsclnt
-376	AUE_NULL	NOPROTO	{ int eaccess(char *path, int flags); }
+376	AUE_NULL	MNOPROTO	{ 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	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, \
+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, \
 				    int newgroup); }
-382	AUE_NULL	NOPROTO	{ int kse_thr_interrupt( \
+382	AUE_NULL	MNOPROTO	{ int kse_thr_interrupt( \
 				    struct kse_thr_mailbox *tmbx); }
-383	AUE_NULL	NOPROTO	{ int kse_release(void); }
+383	AUE_NULL	MNOPROTO	{ 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	NOPROTO	{ int kenv(int what, const char *name, \
+390	AUE_NULL	MNOPROTO	{ int kenv(int what, const char *name, \
 				    char *value, int len); }
-391	AUE_NULL	NOPROTO	{ int lchflags(const char *path, int flags); }
+391	AUE_NULL	MNOPROTO	{ int lchflags(const char *path, int flags); }
 392	AUE_NULL	MNOPROTO { int uuidgen(struct uuid *store, \
 				    int count); }
 393	AUE_NULL	MSTD	{ int freebsd32_sendfile(int fd, int s, \
@@ -660,12 +660,12 @@
 				    size_t nbytes, struct sf_hdtr *hdtr, \
 				    off_t *sbytes, int flags); }
 394	AUE_NULL	UNIMPL	mac_syscall
-395	AUE_NULL	NOPROTO	{ int getfsstat(struct statfs *buf, \
+395	AUE_NULL	MNOPROTO	{ int getfsstat(struct statfs *buf, \
 				    long bufsize, int flags); }
-396	AUE_NULL	NOPROTO	{ int statfs(char *path, \
+396	AUE_NULL	MNOPROTO	{ int statfs(char *path, \
 				    struct statfs *buf); }
-397	AUE_NULL	NOPROTO	{ int fstatfs(int fd, struct statfs *buf); }
-398	AUE_NULL	NOPROTO	{ int fhstatfs(const struct fhandle *u_fhp, \
+397	AUE_NULL	MNOPROTO	{ int fstatfs(int fd, struct statfs *buf); }
+398	AUE_NULL	MNOPROTO	{ int fhstatfs(const struct fhandle *u_fhp, \
 				    struct statfs *buf); }
 399	AUE_NULL	UNIMPL	nosys
 ; XXX implement these?
diff --git a/sys/compat/svr4/syscalls.master b/sys/compat/svr4/syscalls.master
index 279e477..f160208 100644
--- a/sys/compat/svr4/syscalls.master
+++ b/sys/compat/svr4/syscalls.master
@@ -39,28 +39,28 @@
 #include <compat/svr4/svr4_proto.h>
 
 0	AUE_NULL	UNIMPL	unused
-1	AUE_NULL	NOPROTO	{ void sys_exit(int rval); } exit \
+1	AUE_NULL	MNOPROTO	{ 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	STD	{ int svr4_sys_open(char *path, int flags, \
+5	AUE_NULL	MSTD	{ int svr4_sys_open(char *path, int flags, \
 				    int mode); }
 6	AUE_NULL	MNOPROTO { 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); }
+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	STD	{ int svr4_sys_break(caddr_t nsize); }
-18	AUE_NULL	STD	{ int svr4_sys_stat(char* path, \
+18	AUE_NULL	MSTD	{ int svr4_sys_stat(char* path, \
 				    struct svr4_stat* ub); }
-19	AUE_NULL	NOPROTO	{ int lseek(int filedes, off_t *offset, \
+19	AUE_NULL	MNOPROTO	{ int lseek(int filedes, off_t *offset, \
 				    int whence); }
 20	AUE_NULL	MNOPROTO { pid_t getpid(void); }
 21	AUE_NULL	UNIMPL	old_mount
@@ -69,19 +69,19 @@
 24	AUE_NULL	MNOPROTO { uid_t getuid(void); }
 25	AUE_NULL	UNIMPL	stime
 26	AUE_NULL	UNIMPL	ptrace
-27	AUE_NULL	STD	{ int svr4_sys_alarm(unsigned sec); }
-28	AUE_NULL	STD	{ int svr4_sys_fstat(int fd, \
+27	AUE_NULL	MSTD	{ int svr4_sys_alarm(unsigned sec); }
+28	AUE_NULL	MSTD	{ int svr4_sys_fstat(int fd, \
 				    struct svr4_stat *sb); }
 29	AUE_NULL	MSTD	{ int svr4_sys_pause(void); }
-30	AUE_NULL	STD	{ int svr4_sys_utime(char *path, \
+30	AUE_NULL	MSTD	{ int svr4_sys_utime(char *path, \
 				    struct svr4_utimbuf *ubuf); }
 31	AUE_NULL	UNIMPL	stty
 32	AUE_NULL	UNIMPL	gtty
-33	AUE_NULL	STD	{ int svr4_sys_access(char *path, \
+33	AUE_NULL	MSTD	{ int svr4_sys_access(char *path, \
 				    int flags); }
 34	AUE_NULL	MSTD	{ int svr4_sys_nice(int prio); }
 35	AUE_NULL	UNIMPL	statfs
-36	AUE_NULL	NOPROTO	{ int sync(void); }
+36	AUE_NULL	MNOPROTO	{ int sync(void); }
 37	AUE_NULL	MSTD	{ 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, \
@@ -89,16 +89,16 @@
 40	AUE_NULL	UNIMPL	xenix
 41	AUE_NULL	MNOPROTO { int dup(u_int fd); }
 42	AUE_NULL	MNOPROTO { int pipe(void); }
-43	AUE_NULL	STD	{ int svr4_sys_times(struct tms *tp); }
+43	AUE_NULL	MSTD	{ 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, \
 				    svr4_sig_t handler); }
-49	AUE_NULL	STD	{ int svr4_sys_msgsys(int what, int a2, \
+49	AUE_NULL	MSTD	{ int svr4_sys_msgsys(int what, int a2, \
 				    int a3, int a4, int a5); }
-50	AUE_NULL	STD	{ int svr4_sys_sysarch(int op, void *a1); }
+50	AUE_NULL	MSTD	{ int svr4_sys_sysarch(int op, void *a1); }
 51	AUE_NULL	UNIMPL	acct
 52	AUE_NULL	STD	{ int svr4_sys_shmsys(int what, int a2, \
 				    int a3, int a4, int a5); }
@@ -108,13 +108,13 @@
 				    caddr_t data); }
 55	AUE_NULL	UNIMPL	uadmin
 56	AUE_NULL	UNIMPL	exch
-57	AUE_NULL	STD	{ int svr4_sys_utssys(void *a1, void *a2, \
+57	AUE_NULL	MSTD	{ int svr4_sys_utssys(void *a1, void *a2, \
 				    int sel, void *a3); }
-58	AUE_NULL	NOPROTO	{ int fsync(int fd); }
-59	AUE_NULL	STD	{ int svr4_sys_execve(char *path, \
+58	AUE_NULL	MNOPROTO	{ int fsync(int fd); }
+59	AUE_NULL	MSTD	{ int svr4_sys_execve(char *path, \
 				    char **argp, char **envp); }
 60	AUE_NULL	MNOPROTO { int umask(int newmask); }
-61	AUE_NULL	NOPROTO	{ int chroot(char *path); }
+61	AUE_NULL	MNOPROTO	{ int chroot(char *path); }
 62	AUE_NULL	MSTD	{ int svr4_sys_fcntl(int fd, int cmd, \
 				    char *arg); }
 63	AUE_NULL	MSTD	{ int svr4_sys_ulimit(int cmd, \
@@ -134,8 +134,8 @@
 76	AUE_NULL	UNIMPL	rdebug
 77	AUE_NULL	UNIMPL	rfstop
 78	AUE_NULL	UNIMPL	rfsys
-79	AUE_NULL	NOPROTO	{ int rmdir(char *path); }
-80	AUE_NULL	NOPROTO	{ int mkdir(char *path, int mode); }
+79	AUE_NULL	MNOPROTO	{ int rmdir(char *path); }
+80	AUE_NULL	MNOPROTO	{ 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
@@ -147,19 +147,19 @@
 86	AUE_NULL	STD	{ int svr4_sys_putmsg(int fd, \
 				    struct svr4_strbuf *ctl, \
 				    struct svr4_strbuf *dat, int flags); }
-87	AUE_NULL	STD	{ int svr4_sys_poll(struct pollfd *fds, \
+87	AUE_NULL	MSTD	{ int svr4_sys_poll(struct pollfd *fds, \
 				    unsigned int nfds, int timeout); }
-88	AUE_NULL	STD	{ int svr4_sys_lstat(char *path, \
+88	AUE_NULL	MSTD	{ int svr4_sys_lstat(char *path, \
 				    struct svr4_stat *ub); }
-89	AUE_NULL	NOPROTO	{ int symlink(char *path, char *link); }
-90	AUE_NULL	NOPROTO	{ int readlink(char *path, char *buf, \
+89	AUE_NULL	MNOPROTO	{ int symlink(char *path, char *link); }
+90	AUE_NULL	MNOPROTO	{ int readlink(char *path, char *buf, \
 				    int count); }
 91	AUE_NULL	MNOPROTO { int getgroups(u_int gidsetsize, \
 				    gid_t *gidset); }
 92	AUE_NULL	MNOPROTO { int setgroups(u_int gidsetsize, \
 				    gid_t *gidset); }
-93	AUE_NULL	NOPROTO	{ int fchmod(int fd, int mode); }
-94	AUE_NULL	NOPROTO	{ int fchown(int fd, int uid, int gid); }
+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, \
 				    svr4_sigset_t *set, \
 				    svr4_sigset_t *oset); }
@@ -173,68 +173,68 @@
 				    struct svr4_sigaction *osa); }
 99	AUE_NULL	MSTD	{ int svr4_sys_sigpending(int what, \
 				    svr4_sigset_t *mask); }
-100	AUE_NULL	STD	{ int svr4_sys_context(int func, \
+100	AUE_NULL	MSTD	{ int svr4_sys_context(int func, \
 				    struct svr4_ucontext *uc); }
 101	AUE_NULL	UNIMPL	evsys
 102	AUE_NULL	UNIMPL	evtrapret
-103	AUE_NULL	STD	{ int svr4_sys_statvfs(char *path, \
+103	AUE_NULL	MSTD	{ int svr4_sys_statvfs(char *path, \
 				    struct svr4_statvfs *fs); }
-104	AUE_NULL	STD	{ int svr4_sys_fstatvfs(int fd, \
+104	AUE_NULL	MSTD	{ int svr4_sys_fstatvfs(int fd, \
 				    struct svr4_statvfs *fs); }
 105	AUE_NULL	UNIMPL	whoknows
 106	AUE_NULL	UNIMPL	nfssvc
 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	STD	{ int svr4_sys_hrtsys(int cmd, int fun, \
+109	AUE_NULL	MSTD	{ 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	STD	{ int svr4_sys_pathconf(char *path, \
+113	AUE_NULL	MSTD	{ int svr4_sys_pathconf(char *path, \
 				    int name); }
 114	AUE_NULL	UNIMPL	mincore
-115	AUE_NULL	STD	{ caddr_t svr4_sys_mmap(caddr_t addr, \
+115	AUE_NULL	MSTD	{ 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, \
 				    int prot); }
 117	AUE_NULL	MNOPROTO { int munmap(void *addr, int len); }
-118	AUE_NULL	STD	{ int svr4_sys_fpathconf(int fd, int name); }
+118	AUE_NULL	MSTD	{ int svr4_sys_fpathconf(int fd, int name); }
 119	AUE_NULL	MNOPROTO { int vfork(void); }
-120	AUE_NULL	NOPROTO	{ int fchdir(int fd); }
-121	AUE_NULL	NOPROTO	{ int readv(int fd, struct iovec *iovp, \
+120	AUE_NULL	MNOPROTO	{ int fchdir(int fd); }
+121	AUE_NULL	MNOPROTO	{ int readv(int fd, struct iovec *iovp, \
 				    u_int iovcnt); }
-122	AUE_NULL	NOPROTO	{ int writev(int fd, struct iovec *iovp, \
+122	AUE_NULL	MNOPROTO	{ int writev(int fd, struct iovec *iovp, \
 				    u_int iovcnt); }
-123	AUE_NULL	STD	{ int svr4_sys_xstat(int two, char *path, \
+123	AUE_NULL	MSTD	{ int svr4_sys_xstat(int two, char *path, \
 				    struct svr4_xstat *ub); }
-124	AUE_NULL	STD	{ int svr4_sys_lxstat(int two, char *path, \
+124	AUE_NULL	MSTD	{ int svr4_sys_lxstat(int two, char *path, \
 				    struct svr4_xstat *ub); }
-125	AUE_NULL	STD	{ int svr4_sys_fxstat(int two, int fd, \
+125	AUE_NULL	MSTD	{ int svr4_sys_fxstat(int two, int fd, \
 				    struct svr4_xstat *sb); }
-126	AUE_NULL	STD	{ int svr4_sys_xmknod(int two, char *path, \
+126	AUE_NULL	MSTD	{ 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, \
 				    const struct svr4_rlimit *rlp); }
 129	AUE_NULL	MSTD	{ int svr4_sys_getrlimit(int which, \
 				    struct svr4_rlimit *rlp); }
-130	AUE_NULL	NOPROTO	{ int lchown(char *path, uid_t uid, \
+130	AUE_NULL	MNOPROTO	{ int lchown(char *path, uid_t uid, \
 				    gid_t gid); }
-131	AUE_NULL	STD	{ int svr4_sys_memcntl(void * addr, \
+131	AUE_NULL	MSTD	{ 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	NOPROTO	{ int rename(char *from, char *to); }
-135	AUE_NULL	STD	{ int svr4_sys_uname( \
+134	AUE_NULL	MNOPROTO	{ int rename(char *from, char *to); }
+135	AUE_NULL	MSTD	{ int svr4_sys_uname( \
 				    struct svr4_utsname* name, int dummy); }
 136	AUE_NULL	MNOPROTO { int setegid(gid_t egid); }
-137	AUE_NULL	STD	{ int svr4_sys_sysconfig(int name); }
+137	AUE_NULL	MSTD	{ int svr4_sys_sysconfig(int name); }
 138	AUE_NULL	MNOPROTO { int adjtime(struct timeval *delta, \
 				    struct timeval *olddelta); }
-139	AUE_NULL	STD	{ long svr4_sys_systeminfo(int what, \
+139	AUE_NULL	MSTD	{ long svr4_sys_systeminfo(int what, \
 				    char *buf, long len); }
 140	AUE_NULL	UNIMPL	notused
 141	AUE_NULL	MNOPROTO { int seteuid(uid_t euid); }
@@ -251,10 +251,10 @@
 151	AUE_NULL	UNIMPL	notused
 152	AUE_NULL	UNIMPL	modctl
 153	AUE_NULL	STD	{ int svr4_sys_fchroot(int fd); }
-154	AUE_NULL	STD	{ int svr4_sys_utimes(char *path, \
+154	AUE_NULL	MSTD	{ int svr4_sys_utimes(char *path, \
 				    struct timeval *tptr); }
-155	AUE_NULL	STD	{ int svr4_sys_vhangup(void); }
-156	AUE_NULL	STD	{ int svr4_sys_gettimeofday( \
+155	AUE_NULL	MSTD	{ int svr4_sys_vhangup(void); }
+156	AUE_NULL	MSTD	{ int svr4_sys_gettimeofday( \
 				    struct timeval *tp); }
 157	AUE_NULL	MNOPROTO { int getitimer(u_int which, \
 				    struct itimerval *itv); }
@@ -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	STD	{ svr4_off64_t svr4_sys_llseek(int fd, \
+175	AUE_NULL	MSTD	{ 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	STD	{ int svr4_sys_acl(char *path, int cmd, \
+185	AUE_NULL	MSTD	{ int svr4_sys_acl(char *path, int cmd, \
 				    int num, struct svr4_aclent *buf); }
-186	AUE_NULL	STD	{ int svr4_sys_auditsys(int code, int a1, \
+186	AUE_NULL	MSTD	{ 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
@@ -310,7 +310,7 @@
 199	AUE_NULL	MNOPROTO { int nanosleep( \
 				    const struct timespec *rqtp, \
 				    struct timespec *rmtp); }
-200	AUE_NULL	STD	{ int svr4_sys_facl(int fd, int cmd, \
+200	AUE_NULL	MSTD	{ 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); }
@@ -328,18 +328,18 @@
 213	AUE_NULL	STD	{ int svr4_sys_getdents64(int fd, \
 				    struct svr4_dirent64 *dp, int nbytes); }
 ;213	AUE_NULL	UNIMPL	getdents64
-214	AUE_NULL	STD	{ caddr_t svr4_sys_mmap64(void *addr, \
+214	AUE_NULL	MSTD	{ caddr_t svr4_sys_mmap64(void *addr, \
 				    svr4_size_t len, int prot, int flags, \
 				    int fd, svr4_off64_t pos); }
-215	AUE_NULL	STD	{ int svr4_sys_stat64(char *path, \
+215	AUE_NULL	MSTD	{ int svr4_sys_stat64(char *path, \
 				    struct svr4_stat64 *sb); }
-216	AUE_NULL	STD	{ int svr4_sys_lstat64(char *path, \
+216	AUE_NULL	MSTD	{ int svr4_sys_lstat64(char *path, \
 				    struct svr4_stat64 *sb); }
-217	AUE_NULL	STD	{ int svr4_sys_fstat64(int fd, \
+217	AUE_NULL	MSTD	{ int svr4_sys_fstat64(int fd, \
 				    struct svr4_stat64 *sb); }
-218	AUE_NULL	STD	{ int svr4_sys_statvfs64(char *path, \
+218	AUE_NULL	MSTD	{ int svr4_sys_statvfs64(char *path, \
 				    struct svr4_statvfs64 *fs); }
-219	AUE_NULL	STD	{ int svr4_sys_fstatvfs64(int fd, \
+219	AUE_NULL	MSTD	{ int svr4_sys_fstatvfs64(int fd, \
 				    struct svr4_statvfs64 *fs); }
 220	AUE_NULL	MSTD	{ int svr4_sys_setrlimit64(int which, \
 				    const struct svr4_rlimit64 *rlp); }
@@ -347,50 +347,50 @@
 				    struct svr4_rlimit64 *rlp); }
 222	AUE_NULL	UNIMPL	pread64
 223	AUE_NULL	UNIMPL	pwrite64
-224	AUE_NULL	STD	{ int svr4_sys_creat64(char *path, \
+224	AUE_NULL	MSTD	{ int svr4_sys_creat64(char *path, \
 				    int mode); }
-225	AUE_NULL	STD	{ int svr4_sys_open64(char *path, int flags, \
+225	AUE_NULL	MSTD	{ 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	STD	{ int svr4_sys_socket(int domain, int type, \
+230	AUE_NULL	MSTD	{ int svr4_sys_socket(int domain, int type, \
 				    int protocol); }
-231	AUE_NULL	NOPROTO	{ int socketpair(int domain, int type, \
+231	AUE_NULL	MNOPROTO	{ int socketpair(int domain, int type, \
 				    int protocol, int *rsv); }
-232	AUE_NULL	NOPROTO	{ int bind(int s, \
+232	AUE_NULL	MNOPROTO	{ int bind(int s, \
 				    const struct sockaddr *name, \
 				    int namelen); }
-233	AUE_NULL	NOPROTO	{ int listen(int s, int backlog); }
-234	AUE_NULL	NOPROTO	{ int accept(int s, struct sockaddr *name, \
+233	AUE_NULL	MNOPROTO	{ int listen(int s, int backlog); }
+234	AUE_NULL	MNOPROTO	{ int accept(int s, struct sockaddr *name, \
 				    int *anamelen); }
-235	AUE_NULL	NOPROTO	{ int connect(int s, \
+235	AUE_NULL	MNOPROTO	{ int connect(int s, \
 				    const struct sockaddr *name, \
 				    int namelen); }
-236	AUE_NULL	NOPROTO	{ int shutdown(int s, int how); }
-237	AUE_NULL	STD	{ int svr4_sys_recv(int s, caddr_t buf, \
+236	AUE_NULL	MNOPROTO	{ int shutdown(int s, int how); }
+237	AUE_NULL	MSTD	{ int svr4_sys_recv(int s, caddr_t buf, \
 				    int len, int flags); }
-238	AUE_NULL	NOPROTO	{ ssize_t recvfrom(int s, void *buf, \
+238	AUE_NULL	MNOPROTO	{ ssize_t recvfrom(int s, void *buf, \
 				    size_t len, int flags, \
 				    struct sockaddr *from, \
 				    int *fromlenaddr); }
-239	AUE_NULL	NOPROTO	{ ssize_t recvmsg(int s, struct msghdr *msg, \
+239	AUE_NULL	MNOPROTO	{ ssize_t recvmsg(int s, struct msghdr *msg, \
 				    int flags); }
-240	AUE_NULL	STD	{ int svr4_sys_send(int s, caddr_t buf, \
+240	AUE_NULL	MSTD	{ int svr4_sys_send(int s, caddr_t buf, \
 				    int len, int flags); }
-241	AUE_NULL	NOPROTO	{ ssize_t sendmsg(int s, \
+241	AUE_NULL	MNOPROTO	{ ssize_t sendmsg(int s, \
 				    const struct msghdr *msg, int flags); }
-242	AUE_NULL	STD	{ ssize_t svr4_sys_sendto(int s, void *buf, \
+242	AUE_NULL	MSTD	{ ssize_t svr4_sys_sendto(int s, void *buf, \
 				    size_t len, int flags, \
 				    struct sockaddr *to, int tolen); }
-243	AUE_NULL	NOPROTO	{ int getpeername(int fdes, \
+243	AUE_NULL	MNOPROTO	{ int getpeername(int fdes, \
 				    struct sockaddr *asa, int *alen); }
-244	AUE_NULL	NOPROTO	{ int getsockname(int fdes, \
+244	AUE_NULL	MNOPROTO	{ int getsockname(int fdes, \
 				    struct sockaddr *asa, int *alen); }
-245	AUE_NULL	NOPROTO	{ int getsockopt(int s, int level, int name, \
+245	AUE_NULL	MNOPROTO	{ int getsockopt(int s, int level, int name, \
 				    void *val, int *avalsize); }
-246	AUE_NULL	NOPROTO	{ int setsockopt(int s, int level, int name, \
+246	AUE_NULL	MNOPROTO	{ 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); }