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, 200 insertions, 200 deletions

diff --git a/sys/alpha/linux/syscalls.master b/sys/alpha/linux/syscalls.master
index 2cedc8e..a5025a1 100644
--- a/sys/alpha/linux/syscalls.master
+++ b/sys/alpha/linux/syscalls.master
@@ -59,22 +59,22 @@
 				    int options, \
 				    struct osf1_rusage *rusage); }
 8	AUE_NULL	UNIMPL
-9	AUE_NULL	STD	{ int linux_link(char *path, char *to); }
-10	AUE_NULL	STD	{ int linux_unlink(char *path); }
+9	AUE_NULL	MSTD	{ int linux_link(char *path, char *to); }
+10	AUE_NULL	MSTD	{ int linux_unlink(char *path); }
 11	AUE_NULL	UNIMPL
-12	AUE_NULL	STD	{ int linux_chdir(char *path); }
-13	AUE_NULL	NOPROTO	{ int fchdir(int fd); }
-14	AUE_NULL	STD	{ int linux_mknod(char *path, l_int mode, \
+12	AUE_NULL	MSTD	{ int linux_chdir(char *path); }
+13	AUE_NULL	MNOPROTO	{ int fchdir(int fd); }
+14	AUE_NULL	MSTD	{ int linux_mknod(char *path, l_int mode, \
 				    l_dev_t dev); }
-15	AUE_NULL	STD	{ int linux_chmod(char *path, \
+15	AUE_NULL	MSTD	{ int linux_chmod(char *path, \
 				    l_mode_t mode); }
-16	AUE_NULL	STD	{ int linux_chown(char *path, l_uid_t uid, \
+16	AUE_NULL	MSTD	{ int linux_chown(char *path, l_uid_t uid, \
 				    l_gid_t gid); }
 17	AUE_NULL	STD	{ int linux_brk(l_ulong dsend); }
 18	AUE_NULL	UNIMPL
-19	AUE_NULL	STD	{ int linux_lseek(l_uint fdes, l_off_t off, \
+19	AUE_NULL	MSTD	{ int linux_lseek(l_uint fdes, l_off_t off, \
 				    l_int whence); }
-20	AUE_NULL	NOPROTO	{ int getpid(void); } 
+20	AUE_NULL	MNOPROTO	{ int getpid(void); } 
 21	AUE_NULL	UNIMPL	osf1_mount
 22	AUE_NULL	STD	{ int linux_umount(char *path, l_int flags); }
 23	AUE_NULL	MNOPROTO	{ int setuid(uid_t uid); }
@@ -87,10 +87,10 @@
 30	AUE_NULL	UNIMPL
 31	AUE_NULL	UNIMPL
 32	AUE_NULL	UNIMPL
-33	AUE_NULL	STD	{ int linux_access(char *path, l_int flags); }
+33	AUE_NULL	MSTD	{ int linux_access(char *path, l_int flags); }
 34	AUE_NULL	UNIMPL
 35	AUE_NULL	UNIMPL
-36	AUE_NULL	NOPROTO	{ int sync(void); }
+36	AUE_NULL	MNOPROTO	{ int sync(void); }
 37	AUE_NULL	MSTD	{ int linux_kill(l_int pid, l_int signum); }
 38	AUE_NULL	UNIMPL
 39	AUE_NULL	MNOPROTO	{ int setpgid(int pid, int pgid); }
@@ -99,7 +99,7 @@
 42	AUE_NULL	MNOPROTO	{ int pipe(void); }
 43	AUE_NULL	UNIMPL	osf_set_program_attributes
 44	AUE_NULL	UNIMPL
-45	AUE_NULL	STD	{ int linux_open(char *path, l_int flags, \
+45	AUE_NULL	MSTD	{ int linux_open(char *path, l_int flags, \
 				    l_int mode); }
 46	AUE_NULL	UNIMPL
 47	AUE_NULL	MNOPROTO	{ int getgid(void); }
@@ -107,42 +107,42 @@
 				    u_long mask); }
 49	AUE_NULL	UNIMPL
 50	AUE_NULL	UNIMPL
-51	AUE_NULL	NOPROTO	{ int acct(char *path); }
+51	AUE_NULL	MNOPROTO	{ int acct(char *path); }
 52	AUE_NULL	MSTD	{ int linux_sigpending(void); }
 53	AUE_NULL	UNIMPL
 54	AUE_NULL	STD	{ int linux_ioctl(l_uint fd, l_uint cmd, \
 				    l_ulong arg); }
 55	AUE_NULL	UNIMPL
 56	AUE_NULL	UNIMPL
-57	AUE_NULL	STD	{ int linux_symlink(char *path, char *to); }
-58	AUE_NULL	STD	{ int linux_readlink(char *name, char *buf, \
+57	AUE_NULL	MSTD	{ int linux_symlink(char *path, char *to); }
+58	AUE_NULL	MSTD	{ int linux_readlink(char *name, char *buf, \
 				    l_int count); }
-59	AUE_NULL	STD	{ int linux_execve(char *path, char **argp, \
+59	AUE_NULL	MSTD	{ int linux_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	UNIMPL
 63	AUE_NULL	MNOPROTO	{ int getpgrp(void); }
-64	AUE_NULL	STD	{ int linux_getpagesize(void); }
+64	AUE_NULL	MSTD	{ int linux_getpagesize(void); }
 65	AUE_NULL	UNIMPL
 66	AUE_NULL	MSTD	{ int linux_vfork(void); }
-67	AUE_NULL	STD	{ int linux_newstat(char *path, \
+67	AUE_NULL	MSTD	{ int linux_newstat(char *path, \
 				    struct l_newstat *buf); }
-68	AUE_NULL	STD	{ int linux_newlstat(char *path, \
+68	AUE_NULL	MSTD	{ int linux_newlstat(char *path, \
 				    struct l_newstat *buf); }
 69	AUE_NULL	UNIMPL
 70	AUE_NULL	UNIMPL
-71	AUE_NULL	STD	{ int linux_mmap(l_ulong addr, l_ulong len, \
+71	AUE_NULL	MSTD	{ int linux_mmap(l_ulong addr, l_ulong len, \
 				    l_ulong prot, l_ulong flags, l_ulong fd, \
 				    l_ulong pos); }
 72	AUE_NULL	UNIMPL
-73	AUE_NULL	STD	{ int linux_munmap(l_ulong addr, \
+73	AUE_NULL	MSTD	{ int linux_munmap(l_ulong addr, \
 				    l_size_t len); }
-74	AUE_NULL	STD	{ int linux_mprotect(l_ulong addr, \
+74	AUE_NULL	MSTD	{ int linux_mprotect(l_ulong addr, \
 				    l_size_t len, l_ulong prot); }
 75	AUE_NULL	MNOPROTO	{ int madvise(void *addr, \
 				    size_t len, int behav); }
-76	AUE_NULL	STD	{ int linux_vhangup(void); }
+76	AUE_NULL	MSTD	{ int linux_vhangup(void); }
 77	AUE_NULL	UNIMPL
 78	AUE_NULL	UNIMPL
 79	AUE_NULL	MSTD	{ int linux_setgroups(l_int gidsetsize, \
@@ -151,95 +151,95 @@
 				    l_gid_t *grouplist); }
 81	AUE_NULL	UNIMPL	
 82	AUE_NULL	MNODEF	setpgid setpgid setpgid_args int
-83	AUE_NULL	STD	{ int osf1_setitimer(u_int which, \
+83	AUE_NULL	MSTD	{ int osf1_setitimer(u_int which, \
 				    struct itimerval *itv, \
 				    struct itimerval *oitv); }
 84	AUE_NULL	UNIMPL
 85	AUE_NULL	UNIMPL
 86	AUE_NULL	UNIMPL	osf_getitimer
-87	AUE_NULL	STD	{ int linux_gethostname(void); }
+87	AUE_NULL	MSTD	{ int linux_gethostname(void); }
 88	AUE_NULL	MNOPROTO	{ int osethostname(char *hostname, \
 				    u_int len); } osethostname \
 				    sethostname_args int
-89	AUE_NULL	STD	{ int linux_getdtablesize(void); }
+89	AUE_NULL	MSTD	{ int linux_getdtablesize(void); }
 90	AUE_NULL	MNOPROTO	{ int dup2(u_int from, u_int to); }
-91	AUE_NULL	STD	{ int linux_newfstat(l_uint fd, \
+91	AUE_NULL	MSTD	{ int linux_newfstat(l_uint fd, \
 				    struct l_newstat *buf); }
 92	AUE_NULL	MSTD	{ int linux_fcntl(l_uint fd, l_uint cmd, \
 				    l_ulong arg); }
-93	AUE_NULL	STD	{ int osf1_select(u_int nd, fd_set *in, \
+93	AUE_NULL	MSTD	{ int osf1_select(u_int nd, fd_set *in, \
 				    fd_set *ou, fd_set *ex, \
 				    struct timeval *tv); }
-94	AUE_NULL	NOPROTO	{ int poll(struct pollfd*, unsigned int \
+94	AUE_NULL	MNOPROTO	{ int poll(struct pollfd*, unsigned int \
 				    nfds, long timeout); }
-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	STD	{ int osf1_socket(int domain, int type, \
+97	AUE_NULL	MSTD	{ int osf1_socket(int domain, int type, \
 				    int protocol); }
-98	AUE_NULL	STD	{ int linux_connect(l_int s, \
+98	AUE_NULL	MSTD	{ int linux_connect(l_int s, \
 				    struct l_sockaddr *name, l_int namelen); }
-99	AUE_NULL	NOPROTO	{ int oaccept(int s, caddr_t name, \
+99	AUE_NULL	MNOPROTO	{ int oaccept(int s, caddr_t name, \
 				    int *anamelen); } accept accept_args int
 100	AUE_NULL	MSTD	{ int linux_getpriority(int which, int who); }
-101	AUE_NULL	NOPROTO	{ int osend(int s, caddr_t buf, int len, \
+101	AUE_NULL	MNOPROTO	{ int osend(int s, caddr_t buf, int len, \
 				    int flags); }
-102	AUE_NULL	NOPROTO { int orecv(int s, caddr_t buf, int len, \
+102	AUE_NULL	MNOPROTO { int orecv(int s, caddr_t buf, int len, \
 				    int flags); }
 103	AUE_NULL	MSTD	{ int osf1_sigreturn( \
 				    struct osigcontext *sigcntxp); }
-104	AUE_NULL	NOPROTO	{ int bind(int s, caddr_t name, \
+104	AUE_NULL	MNOPROTO	{ int bind(int s, caddr_t name, \
 				    int namelen); }
-105	AUE_NULL	NOPROTO	{ int setsockopt(int s, int level, int name, \
+105	AUE_NULL	MNOPROTO	{ int setsockopt(int s, int level, int name, \
 				    caddr_t val, int valsize); }
-106	AUE_NULL	NOPROTO	{ int listen(int s, int backlog); }
+106	AUE_NULL	MNOPROTO	{ int listen(int s, int backlog); }
 107	AUE_NULL	UNIMPL
 108	AUE_NULL	UNIMPL
 109	AUE_NULL	UNIMPL
 110	AUE_NULL	UNIMPL
 111	AUE_NULL	MSTD	{ int osf1_sigsuspend(unsigned long ss); }
 112	AUE_NULL	UNIMPL	osf_sigstack
-113	AUE_NULL	STD	{ int linux_recvmsg(void); }
-114	AUE_NULL	STD	{ int linux_sendmsg(void); }
+113	AUE_NULL	MSTD	{ int linux_recvmsg(void); }
+114	AUE_NULL	MSTD	{ int linux_sendmsg(void); }
 115	AUE_NULL	UNIMPL
 116	AUE_NULL	MSTD	{ int osf1_gettimeofday(struct timeval *tp, \
 				    struct timezone *tzp); }
-117	AUE_NULL	STD	{ int osf1_getrusage(long who, \
+117	AUE_NULL	MSTD	{ int osf1_getrusage(long who, \
 				    void *rusage); }
-118	AUE_NULL	NOPROTO	{ int getsockopt(int s, int level, int name, \
+118	AUE_NULL	MNOPROTO	{ int getsockopt(int s, int level, int name, \
 				    caddr_t val, int *avalsize); }
 119	AUE_NULL	UNIMPL
-120	AUE_NULL	NOPROTO	{ int readv(int fd, struct iovec *iovp, \
+120	AUE_NULL	MNOPROTO	{ int readv(int fd, struct iovec *iovp, \
 				    u_int iovcnt); }
-121	AUE_NULL	NOPROTO	{ int writev(int fd, struct iovec *iovp, \
+121	AUE_NULL	MNOPROTO	{ int writev(int fd, struct iovec *iovp, \
 				    u_int iovcnt); }
 122	AUE_NULL	UNIMPL	osf_settimeofday
-123	AUE_NULL	NOPROTO	{ int fchown(int fd, int uid, int gid); }
-124	AUE_NULL	NOPROTO	{ int fchmod(int fd, int mode); }
-125	AUE_NULL	NOPROTO	{ int orecvfrom(int s, caddr_t buf, \
+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	MNOPROTO	{ int orecvfrom(int s, caddr_t buf, \
 				    size_t len, int flags, caddr_t from, \
 				    int *fromlenaddr); } recvfrom \
 				    recvfrom_args int
 126	AUE_NULL	MNOPROTO	{ int setreuid(int ruid, int euid); }
 127	AUE_NULL	MNOPROTO	{ int setregid(int rgid, int egid); }
-128	AUE_NULL	STD	{ int linux_rename(char *from, char *to); }
-129	AUE_NULL	STD	{ int linux_truncate(char *path, \
+128	AUE_NULL	MSTD	{ int linux_rename(char *from, char *to); }
+129	AUE_NULL	MSTD	{ int linux_truncate(char *path, \
 				    l_ulong length); }
-130	AUE_NULL	NOPROTO	{ int oftruncate(int fd, long length); }
-131	AUE_NULL	NOPROTO	{ int flock(int fd, int how); }
+130	AUE_NULL	MNOPROTO	{ int oftruncate(int fd, long length); }
+131	AUE_NULL	MNOPROTO	{ int flock(int fd, int how); }
 132	AUE_NULL	MNOPROTO	{ int setgid(gid_t gid); }
-133	AUE_NULL	STD	{ int osf1_sendto(int s, caddr_t buf, \
+133	AUE_NULL	MSTD	{ int osf1_sendto(int s, caddr_t buf, \
 				    size_t len, int flags, \
 				    struct sockaddr *to, int tolen); }
-134	AUE_NULL	NOPROTO	{ int shutdown(int s, int how); }
-135	AUE_NULL	STD	{ int linux_socketpair(void); }
-136	AUE_NULL	STD	{ int linux_mkdir(char *path, l_int mode); }
-137	AUE_NULL	STD	{ int linux_rmdir(char *path); }
-138	AUE_NULL	NOPROTO	{ int utimes(char *path, \
+134	AUE_NULL	MNOPROTO	{ int shutdown(int s, int how); }
+135	AUE_NULL	MSTD	{ int linux_socketpair(void); }
+136	AUE_NULL	MSTD	{ int linux_mkdir(char *path, l_int mode); }
+137	AUE_NULL	MSTD	{ int linux_rmdir(char *path); }
+138	AUE_NULL	MNOPROTO	{ int utimes(char *path, \
 				    struct timeval *tptr); }
 139	AUE_NULL	UNIMPL
 140	AUE_NULL	UNIMPL
-141	AUE_NULL	NOPROTO	{ int ogetpeername(int fdes, caddr_t asa, \
+141	AUE_NULL	MNOPROTO	{ int ogetpeername(int fdes, caddr_t asa, \
 				    int *alen); }
 142	AUE_NULL	UNIMPL
 143	AUE_NULL	UNIMPL
@@ -249,9 +249,9 @@
 				    struct l_rlimit *rlim); }
 146	AUE_NULL	UNIMPL
 147	AUE_NULL	MNOPROTO	{ int setsid(void); }
-148	AUE_NULL	STD	{ int linux_quotactl(void); }
+148	AUE_NULL	MSTD	{ int linux_quotactl(void); }
 149	AUE_NULL	UNIMPL
-150	AUE_NULL	NOPROTO	{ int ogetsockname(int fdec, caddr_t asa, \
+150	AUE_NULL	MNOPROTO	{ int ogetsockname(int fdec, caddr_t asa, \
 				    int *alen);} getsockname \
 				    getsockname_args int
 151	AUE_NULL	UNIMPL
@@ -306,38 +306,38 @@
 197	AUE_NULL	UNIMPL
 198	AUE_NULL	UNIMPL
 199	AUE_NULL	UNIMPL	osf_swapon
-200	AUE_NULL	STD	{ int linux_msgctl(l_int msqid, l_int cmd, \
+200	AUE_NULL	MSTD	{ int linux_msgctl(l_int msqid, l_int cmd, \
 				    struct l_msqid_ds *buf); }
-201	AUE_NULL	STD	{ int linux_msgget(l_key_t key, \
+201	AUE_NULL	MSTD	{ int linux_msgget(l_key_t key, \
 				    l_int msgflg); }
-202	AUE_NULL	STD	{ int linux_msgrcv(l_int msqid, \
+202	AUE_NULL	MSTD	{ int linux_msgrcv(l_int msqid, \
 				    struct l_msgbuf *msgp, l_size_t msgsz, \
 				    l_long msgtyp, l_int msgflg); }
-203	AUE_NULL	STD	{ int linux_msgsnd(l_int msqid, \
+203	AUE_NULL	MSTD	{ int linux_msgsnd(l_int msqid, \
 				    struct l_msgbuf *msgp, l_size_t msgsz, \
 				    l_int msgflg); }
 204	AUE_NULL	STD	{ int linux_semctl(l_int semid, \
 				    l_int semnum, l_int cmd, \
 				    union l_semun arg); }
-205	AUE_NULL	STD	{ int linux_semget(l_key_t key, l_int nsems, \
+205	AUE_NULL	MSTD	{ int linux_semget(l_key_t key, l_int nsems, \
 				    l_int semflg); }
-206	AUE_NULL	STD	{ int linux_semop(l_int semid, \
+206	AUE_NULL	MSTD	{ int linux_semop(l_int semid, \
 				    struct l_sembuf *tsops, l_uint nsops); }
 207	AUE_NULL	UNIMPL	osf_utsname
-208	AUE_NULL	STD	{ int linux_lchown(char *path, l_uid_t uid, \
+208	AUE_NULL	MSTD	{ int linux_lchown(char *path, l_uid_t uid, \
 				    l_gid_t gid); }
-209	AUE_NULL	STD	{ int linux_shmat(l_int shmid, \
+209	AUE_NULL	MSTD	{ int linux_shmat(l_int shmid, \
 				    char *shmaddr, l_int shmflg); }
-210	AUE_NULL	STD	{ int linux_shmctl(l_int shmid, l_int cmd, \
+210	AUE_NULL	MSTD	{ int linux_shmctl(l_int shmid, l_int cmd, \
 				    struct l_shmid_ds *buf); }
-211	AUE_NULL	STD	{ int linux_shmdt(char *shmaddr); }
-212	AUE_NULL	STD	{ int linux_shmget(l_key_t key, \
+211	AUE_NULL	MSTD	{ int linux_shmdt(char *shmaddr); }
+212	AUE_NULL	MSTD	{ int linux_shmget(l_key_t key, \
 				    l_size_t size, l_int shmflg); }
 213	AUE_NULL	UNIMPL
 214	AUE_NULL	UNIMPL
 215	AUE_NULL	UNIMPL
 216	AUE_NULL	UNIMPL
-217	AUE_NULL	STD	{ int linux_msync(l_ulong addr, \
+217	AUE_NULL	MSTD	{ int linux_msync(l_ulong addr, \
 				    l_size_t len, l_int fl); }
 218	AUE_NULL	UNIMPL
 219	AUE_NULL	UNIMPL
@@ -356,7 +356,7 @@
 232	AUE_NULL	UNIMPL
 233	AUE_NULL	MNOPROTO	{ int getpgid(int pid); }
 234	AUE_NULL	MSTD	{ int linux_getsid(l_pid_t pid); }
-235	AUE_NULL	STD	{ int linux_sigaltstack(void); }
+235	AUE_NULL	MSTD	{ int linux_sigaltstack(void); }
 236	AUE_NULL	UNIMPL
 237	AUE_NULL	UNIMPL
 238	AUE_NULL	UNIMPL
@@ -376,13 +376,13 @@
 251	AUE_NULL	UNIMPL	osf_usleep_thread
 252	AUE_NULL	UNIMPL
 253	AUE_NULL	UNIMPL
-254	AUE_NULL	STD	{ int linux_sysfs(l_int option, \
+254	AUE_NULL	MSTD	{ int linux_sysfs(l_int option, \
 				    l_ulong arg1, l_ulong arg2); }
 255	AUE_NULL	UNIMPL
-256	AUE_NULL	STD	{ int osf1_getsysinfo(u_long op, \
+256	AUE_NULL	MSTD	{ int osf1_getsysinfo(u_long op, \
 				    caddr_t buffer, u_long nbytes, \
 				    caddr_t arg, u_long flag); }
-257	AUE_NULL	STD	{ int osf1_setsysinfo(u_long op, \
+257	AUE_NULL	MSTD	{ int osf1_setsysinfo(u_long op, \
 				    caddr_t buffer, u_long nbytes, \
 				    caddr_t arg, u_long flag); }
 258	AUE_NULL	UNIMPL
@@ -427,22 +427,22 @@
 297	AUE_NULL	UNIMPL
 298	AUE_NULL	UNIMPL
 299	AUE_NULL	UNIMPL
-300	AUE_NULL	STD	{ int linux_bdflush(void); }
-301	AUE_NULL	STD	{ int linux_sethae(void); }
+300	AUE_NULL	MSTD	{ int linux_bdflush(void); }
+301	AUE_NULL	MSTD	{ int linux_sethae(void); }
 302	AUE_NULL	STD	{ int linux_mount(char *specialfile, \
 				    char *dir, char *filesystemtype, \
 				    l_ulong rwflag, void *data); }
-303	AUE_NULL	STD	{ int linux_old_adjtimex(void); }
-304	AUE_NULL	STD	{ int linux_swapoff(void); }
+303	AUE_NULL	MSTD	{ int linux_old_adjtimex(void); }
+304	AUE_NULL	MSTD	{ int linux_swapoff(void); }
 305	AUE_NULL	STD	{ int linux_getdents(l_uint fd, void *dent, \
 				    l_uint count); }
-306	AUE_NULL	STD	{ int linux_create_module(void); }
-307	AUE_NULL	STD	{ int linux_init_module(void); }
-308	AUE_NULL	STD	{ int linux_delete_module(void); }
-309	AUE_NULL	STD	{ int linux_get_kernel_syms(void); }
-310	AUE_NULL	STD	{ int linux_syslog(l_int type, char *buf, \
+306	AUE_NULL	MSTD	{ int linux_create_module(void); }
+307	AUE_NULL	MSTD	{ int linux_init_module(void); }
+308	AUE_NULL	MSTD	{ int linux_delete_module(void); }
+309	AUE_NULL	MSTD	{ int linux_get_kernel_syms(void); }
+310	AUE_NULL	MSTD	{ int linux_syslog(l_int type, char *buf, \
 				    l_int len); }
-311	AUE_NULL	STD	{ int linux_reboot(l_int magic1, \
+311	AUE_NULL	MSTD	{ int linux_reboot(l_int magic1, \
 				    l_int magic2, l_uint cmd, void *arg); }
 312	AUE_NULL	MSTD	{ int linux_clone(l_int flags, void *stack); }
 313	AUE_NULL	STD	{ int linux_uselib(char *library); }	
@@ -452,21 +452,21 @@
 				    size_t len); }
 316	AUE_NULL	MNOPROTO	{ int mlockall(int how); }
 317	AUE_NULL	MNOPROTO	{ int munlockall(void); }
-318	AUE_NULL	STD	{ int linux_sysinfo(void); }
-319	AUE_NULL	STD	{ int linux_sysctl( \
+318	AUE_NULL	MSTD	{ int linux_sysinfo(void); }
+319	AUE_NULL	MSTD	{ int linux_sysctl( \
 				    struct l___sysctl_args *args); }
 320	AUE_NULL	UNIMPL	sys_idle
 321	AUE_NULL	STD	{ int linux_oldumount(char *path); }
-322	AUE_NULL	NOPROTO	{ int swapon(char *name); }
-323	AUE_NULL	STD	{ int linux_times(struct l_times_argv *buf); }
-324	AUE_NULL	STD	{ int linux_personality(l_ulong per); }
-325	AUE_NULL	STD	{ int linux_setfsuid(l_uid_t uid); }
-326	AUE_NULL	STD	{ int linux_setfsgid(l_gid_t gid); }
-327	AUE_NULL	STD	{ int linux_ustat(l_dev_t dev, \
+322	AUE_NULL	MNOPROTO	{ int swapon(char *name); }
+323	AUE_NULL	MSTD	{ int linux_times(struct l_times_argv *buf); }
+324	AUE_NULL	MSTD	{ int linux_personality(l_ulong per); }
+325	AUE_NULL	MSTD	{ int linux_setfsuid(l_uid_t uid); }
+326	AUE_NULL	MSTD	{ int linux_setfsgid(l_gid_t gid); }
+327	AUE_NULL	MSTD	{ int linux_ustat(l_dev_t dev, \
 				    struct l_ustat *ubuf); }
-328	AUE_NULL	STD	{ int linux_statfs(char *path, \
+328	AUE_NULL	MSTD	{ int linux_statfs(char *path, \
 				    struct l_statfs_buf *buf); }
-329	AUE_NULL	STD	{ int linux_fstatfs(l_uint fd, \
+329	AUE_NULL	MSTD	{ int linux_fstatfs(l_uint fd, \
 				    struct l_statfs_buf *buf); }
 330	AUE_NULL	MNOPROTO	{ int sched_setparam(pid_t pid, \
 				    const struct sched_param *param); }
@@ -481,43 +481,43 @@
 				    l_int policy); }
 336	AUE_NULL	MSTD	{ int linux_sched_get_priority_min( \
 				    l_int policy); }
-337	AUE_NULL	NOPROTO	{ int sched_rr_get_interval (pid_t pid, \
+337	AUE_NULL	MNOPROTO	{ int sched_rr_get_interval (pid_t pid, \
 				    struct timespec *interval); }
 338	AUE_NULL	UNIMPL	sys_afs_syscall
-339	AUE_NULL	STD	{ int linux_newuname( \
+339	AUE_NULL	MSTD	{ int linux_newuname( \
 				    struct l_newuname_t *buf); }
 340	AUE_NULL	MNOPROTO	{ int nanosleep( \
 				    const struct timespec *rqtp, \
 				    struct timespec *rmtp); }
-341	AUE_NULL	STD	{ int linux_mremap(l_ulong addr, \
+341	AUE_NULL	MSTD	{ int linux_mremap(l_ulong addr, \
 				    l_ulong old_len, l_ulong new_len, \
 				    l_ulong flags, l_ulong new_addr); }
-342	AUE_NULL	STD	{ int linux_nfsservctl(void); }
+342	AUE_NULL	MSTD	{ int linux_nfsservctl(void); }
 343	AUE_NULL	MNOPROTO	{ int setresuid(uid_t ruid, \
 				    uid_t euid, uid_t suid); }
 344	AUE_NULL	MNOPROTO	{ int getresuid(uid_t *ruid, \
 				    uid_t *euid, uid_t *suid); }
-345	AUE_NULL	STD	{ int linux_pciconfig_read(void); }
-346	AUE_NULL	STD	{ int linux_pciconfig_write(void); }
-347	AUE_NULL	STD	{ int linux_query_module(void); }
-348	AUE_NULL	STD	{ int linux_prctl(void); }
-349	AUE_NULL	STD	{ int linux_pread(l_uint fd, char *buf, \
+345	AUE_NULL	MSTD	{ int linux_pciconfig_read(void); }
+346	AUE_NULL	MSTD	{ int linux_pciconfig_write(void); }
+347	AUE_NULL	MSTD	{ int linux_query_module(void); }
+348	AUE_NULL	MSTD	{ int linux_prctl(void); }
+349	AUE_NULL	MSTD	{ int linux_pread(l_uint fd, char *buf, \
 				    l_size_t nbyte, l_loff_t offset); }
-350	AUE_NULL	STD	{ int linux_pwrite(l_uint fd, char *buf, \
+350	AUE_NULL	MSTD	{ int linux_pwrite(l_uint fd, char *buf, \
 				    l_size_t nbyte, l_loff_t offset); }
-351	AUE_NULL	STD	{ int linux_rt_sigreturn(void); }
+351	AUE_NULL	MSTD	{ int linux_rt_sigreturn(void); }
 352	AUE_NULL	MSTD	{ int linux_rt_sigaction(l_int sig, \
 				    l_sigaction_t *act, l_sigaction_t *oact, \
 				    l_size_t sigsetsize); }
 353	AUE_NULL	MSTD	{ int linux_rt_sigprocmask(l_int how, \
 				    l_sigset_t *mask, l_sigset_t *omask, \
 				    l_size_t sigsetsize); }
-354	AUE_NULL	STD	{ int linux_rt_sigpending(void); }
-355	AUE_NULL	STD	{ int linux_rt_sigtimedwait(void); }
-356	AUE_NULL	STD	{ int linux_rt_sigqueueinfo(void); }
+354	AUE_NULL	MSTD	{ int linux_rt_sigpending(void); }
+355	AUE_NULL	MSTD	{ int linux_rt_sigtimedwait(void); }
+356	AUE_NULL	MSTD	{ int linux_rt_sigqueueinfo(void); }
 357	AUE_NULL	MSTD	{ int linux_rt_sigsuspend(l_sigset_t \
 				    *newset, l_size_t sigsetsize); }
-358	AUE_NULL	STD	{ int linux_select(l_int nfds, \
+358	AUE_NULL	MSTD	{ int linux_select(l_int nfds, \
 				    l_fd_set *readfds, l_fd_set *writefds, \
 				    l_fd_set *exceptfds, \
 				    struct l_timeval *timeout); }
@@ -532,27 +532,27 @@
 362	AUE_NULL	MSTD	{ int linux_setitimer(l_int which, \
 				    struct l_itimerval *itv, \
 				    struct l_itimerval *oitv); }
-363	AUE_NULL	STD	{ int linux_utimes(char *fname, \
+363	AUE_NULL	MSTD	{ int linux_utimes(char *fname, \
 				    struct l_timeval *times); }
 364	AUE_NULL	MNOPROTO	{ int getrusage(int who, \
 				    struct rusage *rusage); }
 365	AUE_NULL	MSTD	{ int linux_wait4(l_pid_t pid, \
 				    l_uint *status, l_int options, \
 				    struct l_rusage *rusage); }		
-366	AUE_NULL	STD	{ int linux_adjtimex(void); }
-367	AUE_NULL	STD	{ int linux_getcwd(char *buf, \
+366	AUE_NULL	MSTD	{ int linux_adjtimex(void); }
+367	AUE_NULL	MSTD	{ int linux_getcwd(char *buf, \
 				    l_ulong bufsize); }
-368	AUE_NULL	STD	{ int linux_capget(void); }
-369	AUE_NULL	STD	{ int linux_capset(void); }
-370	AUE_NULL	STD	{ int linux_sendfile(void); }
+368	AUE_NULL	MSTD	{ int linux_capget(void); }
+369	AUE_NULL	MSTD	{ int linux_capset(void); }
+370	AUE_NULL	MSTD	{ int linux_sendfile(void); }
 371	AUE_NULL	MNOPROTO	{ int setresgid(gid_t rgid, \
 				    gid_t egid, gid_t sgid); }
 372	AUE_NULL	MNOPROTO	{ int getresgid(gid_t *rgid, \
 				    gid_t *egid, gid_t *sgid); }
 373	AUE_NULL	UNIMPL	sys_dipc
-374	AUE_NULL	STD	{ int linux_pivot_root(char *new_root, \
+374	AUE_NULL	MSTD	{ int linux_pivot_root(char *new_root, \
 				    char *put_old); }
-375	AUE_NULL	STD	{ int linux_mincore(l_ulong start, \
+375	AUE_NULL	MSTD	{ int linux_mincore(l_ulong start, \
 				    l_size_t len, u_char *vec); }
-376	AUE_NULL	STD	{ int linux_pciconfig_iobase(void); }
+376	AUE_NULL	MSTD	{ int linux_pciconfig_iobase(void); }
 377	AUE_NULL	STD	{ int linux_getdents64(l_uint fd, void *dirent, l_uint count); }
diff --git a/sys/alpha/osf1/syscalls.master b/sys/alpha/osf1/syscalls.master
index ecf9017..1de440a 100644
--- a/sys/alpha/osf1/syscalls.master
+++ b/sys/alpha/osf1/syscalls.master
@@ -35,7 +35,7 @@
 #include <alpha/osf1/osf1_proto.h>
 
 
-0	AUE_NULL	NOPROTO	{ int nosys(void); }
+0	AUE_NULL	MNOPROTO	{ int nosys(void); }
 1	AUE_NULL	MNOPROTO { void sys_exit(int rval); } exit \
 				    sys_exit_args void
 2	AUE_NULL	MNOPROTO { int fork(void); }
@@ -49,20 +49,20 @@
 				    int options, \
 				    struct osf1_rusage *rusage); }
 8	AUE_NULL	UNIMPL	old creat
-9	AUE_NULL	NOPROTO	{ int link(char *path, char *link); }
-10	AUE_NULL	NOPROTO	{ int unlink(char *path); }
+9	AUE_NULL	MNOPROTO	{ int link(char *path, char *link); }
+10	AUE_NULL	MNOPROTO	{ int unlink(char *path); }
 11	AUE_NULL	UNIMPL	execv
-12	AUE_NULL	NOPROTO	{ int chdir(char *path); }
-13	AUE_NULL	NOPROTO	{ int fchdir(int fd); }
-14	AUE_NULL	STD	{ int osf1_mknod(char *path, int mode, \
+12	AUE_NULL	MNOPROTO	{ int chdir(char *path); }
+13	AUE_NULL	MNOPROTO	{ int fchdir(int fd); }
+14	AUE_NULL	MSTD	{ int osf1_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); }
-17	AUE_NULL	NOPROTO	{ int obreak(char *nsize); }
-18	AUE_NULL	STD	{ int osf1_getfsstat( \
+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); }
+18	AUE_NULL	MSTD	{ int osf1_getfsstat( \
 				    struct osf1_statfs *buf, long bufsize, \
 				    int flags); }
-19	AUE_NULL	STD	{ off_t osf1_lseek(int fd, off_t offset, \
+19	AUE_NULL	MSTD	{ off_t osf1_lseek(int fd, off_t offset, \
 				    int whence); }
 20	AUE_NULL	MNOPROTO { pid_t getpid(void); }
 21	AUE_NULL	STD	{ int osf1_mount(int type, char *path, \
@@ -74,19 +74,19 @@
 26	AUE_NULL	UNIMPL	ptrace
 27	AUE_NULL	UNIMPL	recvmsg
 28	AUE_NULL	UNIMPL	sendmsg
-29	AUE_NULL	NOPROTO	{ int recvfrom(int s, caddr_t buf, \
+29	AUE_NULL	MNOPROTO	{ int recvfrom(int s, caddr_t buf, \
 				    size_t len, int flags, caddr_t from, \
 				    int *fromlenaddr); }
-30	AUE_NULL	NOPROTO	{ int accept(int s, caddr_t name, \
+30	AUE_NULL	MNOPROTO	{ int accept(int s, caddr_t name, \
 				    int *anamelen); }
-31	AUE_NULL	NOPROTO	{ int getpeername(int fdes, caddr_t asa, \
+31	AUE_NULL	MNOPROTO	{ int getpeername(int fdes, caddr_t asa, \
 				    int *alen); }
-32	AUE_NULL	NOPROTO	{ int getsockname(int fdes, caddr_t asa, \
+32	AUE_NULL	MNOPROTO	{ int getsockname(int fdes, caddr_t asa, \
 				    int *alen); }
-33	AUE_NULL	STD	{ int osf1_access(char *path, int flags); }
+33	AUE_NULL	MSTD	{ int osf1_access(char *path, int flags); }
 34	AUE_NULL	UNIMPL	chflags
 35	AUE_NULL	UNIMPL	fchflags
-36	AUE_NULL	NOPROTO	{ int sync(void); }
+36	AUE_NULL	MNOPROTO	{ int sync(void); }
 37	AUE_NULL	MSTD	{ int osf1_kill(int pid, int signum); }
 38	AUE_NULL	UNIMPL	old stat
 39	AUE_NULL	MNOPROTO { int setpgid(int pid, int pgid); }
@@ -99,7 +99,7 @@
 				    vm_offset_t bss_start, \
 				    vm_offset_t bss_len); }
 44	AUE_NULL	UNIMPL	profil
-45	AUE_NULL	STD	{ int osf1_open(char *path, int flags, \
+45	AUE_NULL	MSTD	{ int osf1_open(char *path, int flags, \
 				    int mode); }
 46	AUE_NULL	OBSOL	sigaction
 47	AUE_NULL	MNOPROTO { gid_t getgid(void); }
@@ -108,30 +108,30 @@
 49	AUE_NULL	MNOPROTO { int getlogin(char *namebuf, \
 				    u_int namelen); }
 50	AUE_NULL	MNOPROTO { int setlogin(char *namebuf); }
-51	AUE_NULL	NOPROTO	{ int acct(char *path); }
+51	AUE_NULL	MNOPROTO	{ int acct(char *path); }
 52	AUE_NULL	MSTD	{ int osf1_sigpending(struct proc *p, \
 				    osf1_sigset_t *mask ); }
-53	AUE_NULL	STD	{ int osf1_classcntl(int opcode, int arg1, \
+53	AUE_NULL	MSTD	{ int osf1_classcntl(int opcode, int arg1, \
 				    int arg2, int arg3);}
 54	AUE_NULL	STD	{ int osf1_ioctl(int fd, int com, \
 				    caddr_t data); }
-55	AUE_NULL	STD	{ int osf1_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, \
+55	AUE_NULL	MSTD	{ int osf1_reboot(int opt); }
+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 osf1_execve(char *path, char **argp, \
+59	AUE_NULL	MSTD	{ int osf1_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	UNIMPL	old fstat
 63	AUE_NULL	MNOPROTO { int getpgrp(void); }
-64	AUE_NULL	NOPROTO	{ int ogetpagesize(void); }
+64	AUE_NULL	MNOPROTO	{ int ogetpagesize(void); }
 65	AUE_NULL	UNIMPL	mremap
 66	AUE_NULL	MNOPROTO { int vfork(void); }
-67	AUE_NULL	STD	{ int osf1_stat(char *path, \
+67	AUE_NULL	MSTD	{ int osf1_stat(char *path, \
 				    struct osf1_stat *ub); }
-68	AUE_NULL	STD	{ int osf1_lstat(char *path, \
+68	AUE_NULL	MSTD	{ int osf1_lstat(char *path, \
 				    struct osf1_stat *ub); }
 69	AUE_NULL	UNIMPL	sbrk
 70	AUE_NULL	UNIMPL	sstk
@@ -139,11 +139,11 @@
 				    size_t len, int prot, int flags, int fd, \
 				    off_t pos); }
 72	AUE_NULL	UNIMPL	ovadvise
-73	AUE_NULL	NOPROTO	{ int munmap(caddr_t addr, size_t len); }
-74	AUE_NULL	NOPROTO	{ int mprotect(void *addr, size_t len, \
+73	AUE_NULL	MNOPROTO	{ int munmap(caddr_t addr, size_t len); }
+74	AUE_NULL	MNOPROTO	{ int mprotect(void *addr, size_t len, \
 				    int prot); }
 ; XXX
-75	AUE_NULL	STD	{ int osf1_madvise(void); }
+75	AUE_NULL	MSTD	{ int osf1_madvise(void); }
 76	AUE_NULL	UNIMPL	old vhangup
 77	AUE_NULL	UNIMPL	kmodcall
 78	AUE_NULL	UNIMPL	mincore
@@ -154,13 +154,13 @@
 81	AUE_NULL	UNIMPL	old getpgrp
 ; OSF/1 setpgrp(); identical in function to setpgid().  XXX
 82	AUE_NULL	MSTD	{ int osf1_setpgrp(int pid, int pgid); } 
-83	AUE_NULL	STD	{ int osf1_setitimer(u_int which, \
+83	AUE_NULL	MSTD	{ int osf1_setitimer(u_int which, \
 				    struct itimerval *itv, \
 				    struct itimerval *oitv); }
 84	AUE_NULL	UNIMPL	old wait
-85	AUE_NULL	STD	{ int osf1_table(long id, long index, \
+85	AUE_NULL	MSTD	{ int osf1_table(long id, long index, \
 				    void *addr, long nel, u_long lel); }
-86	AUE_NULL	STD	{ int osf1_getitimer(u_int which, \
+86	AUE_NULL	MSTD	{ int osf1_getitimer(u_int which, \
 				    struct itimerval *itv); }
 87	AUE_NULL	MNOPROTO { int ogethostname(char *hostname, \
 				    u_int len); } ogethostname \
@@ -170,35 +170,35 @@
 				    sethostname_args int
 89	AUE_NULL	MNOPROTO { int getdtablesize(void); }
 90	AUE_NULL	MNOPROTO { int dup2(u_int from, u_int to); }
-91	AUE_NULL	STD	{ int osf1_fstat(int fd, void *sb); }
+91	AUE_NULL	MSTD	{ int osf1_fstat(int fd, void *sb); }
 92	AUE_NULL	MSTD	{ int osf1_fcntl(int fd, int cmd, \
 				    void *arg); }
-93	AUE_NULL	STD	{ int osf1_select(u_int nd, fd_set *in, \
+93	AUE_NULL	MSTD	{ int osf1_select(u_int nd, fd_set *in, \
 				    fd_set *ou, fd_set *ex, \
 				    struct timeval *tv); }
-94	AUE_NULL	NOPROTO	{ int poll(struct pollfd *fds, u_int nfds, \
+94	AUE_NULL	MNOPROTO	{ int poll(struct pollfd *fds, u_int nfds, \
 				    int timeout); }
-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	STD	{ int osf1_socket(int domain, int type, \
+97	AUE_NULL	MSTD	{ int osf1_socket(int domain, int type, \
 				    int protocol); }
-98	AUE_NULL	NOPROTO	{ int connect(int s, caddr_t name, \
+98	AUE_NULL	MNOPROTO	{ int connect(int s, caddr_t name, \
 				    int namelen); }
-99	AUE_NULL	NOPROTO	{ int oaccept(int s, caddr_t name, \
+99	AUE_NULL	MNOPROTO	{ int oaccept(int s, caddr_t name, \
 				    int *anamelen); } oaccept accept_args int
 100	AUE_NULL	MNOPROTO { int getpriority(int which, int who); }
-101	AUE_NULL	NOPROTO	{ int osend(int s, caddr_t buf, int len, \
+101	AUE_NULL	MNOPROTO	{ int osend(int s, caddr_t buf, int len, \
 				    int flags); }
-102	AUE_NULL	NOPROTO	{ int orecv(int s, caddr_t buf, int len, \
+102	AUE_NULL	MNOPROTO	{ int orecv(int s, caddr_t buf, int len, \
 				    int flags); }
 103	AUE_NULL	MSTD	{ int osf1_sigreturn( \
 				    struct osigcontext *sigcntxp); }
-104	AUE_NULL	NOPROTO	{ int bind(int s, caddr_t name, \
+104	AUE_NULL	MNOPROTO	{ int bind(int s, caddr_t name, \
 				    int namelen); }
-105	AUE_NULL	NOPROTO	{ int setsockopt(int s, int level, int name, \
+105	AUE_NULL	MNOPROTO	{ int setsockopt(int s, int level, int name, \
 				    caddr_t val, int valsize); }
-106	AUE_NULL	NOPROTO	{ int listen(int s, int backlog); }
+106	AUE_NULL	MNOPROTO	{ int listen(int s, int backlog); }
 107	AUE_NULL	UNIMPL	plock
 108	AUE_NULL	UNIMPL	old sigvec
 109	AUE_NULL	UNIMPL	old sigblock
@@ -209,47 +209,47 @@
 113	AUE_NULL	UNIMPL	old recvmsg
 114	AUE_NULL	UNIMPL	old sendmsg
 115	AUE_NULL	UNIMPL	vtrace
-116	AUE_NULL	STD	{ int osf1_gettimeofday(struct timeval *tp, \
+116	AUE_NULL	MSTD	{ int osf1_gettimeofday(struct timeval *tp, \
 				    struct timezone *tzp); }
 ; XXX
-117	AUE_NULL	STD	{ int osf1_getrusage(long who, \
+117	AUE_NULL	MSTD	{ int osf1_getrusage(long who, \
 				    void *rusage); }
-118	AUE_NULL	NOPROTO	{ int getsockopt(int s, int level, int name, \
+118	AUE_NULL	MNOPROTO	{ int getsockopt(int s, int level, int name, \
 				    caddr_t val, int *avalsize); }
 119	AUE_NULL	UNIMPL	
-120	AUE_NULL	STD	{ int osf1_readv(int fd, \
+120	AUE_NULL	MSTD	{ int osf1_readv(int fd, \
 				    struct osf1_iovec *iovp, u_int iovcnt); }
-121	AUE_NULL	STD	{ int osf1_writev(int fd, \
+121	AUE_NULL	MSTD	{ int osf1_writev(int fd, \
 				    struct osf1_iovec *iovp, u_int iovcnt); }
 122	AUE_NULL	MNOPROTO { int settimeofday(struct timeval *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); }
-125	AUE_NULL	NOPROTO	{ int orecvfrom(int s, caddr_t buf, \
+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	MNOPROTO	{ int orecvfrom(int s, caddr_t buf, \
 				    size_t len, int flags, caddr_t from, \
 				    int *fromlenaddr); } orecvfrom \
 				    recvfrom_args int
 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(const char *from, \
+128	AUE_NULL	MNOPROTO	{ int rename(const char *from, \
 				    const char *to); }
-129	AUE_NULL	STD	{ int osf1_truncate(char *path, \
+129	AUE_NULL	MSTD	{ int osf1_truncate(char *path, \
 				    off_t length); }
-130	AUE_NULL	STD	{ int osf1_ftruncate(int fd, off_t length); }
-131	AUE_NULL	NOPROTO	{ int flock(int fd, int how); }
+130	AUE_NULL	MSTD	{ int osf1_ftruncate(int fd, off_t length); }
+131	AUE_NULL	MNOPROTO	{ int flock(int fd, int how); }
 132	AUE_NULL	MSTD	{ int osf1_setgid(gid_t gid); }
-133	AUE_NULL	STD	{ int osf1_sendto(int s, caddr_t buf, \
+133	AUE_NULL	MSTD	{ int osf1_sendto(int s, caddr_t buf, \
 				    size_t len, int flags, \
 				    struct sockaddr *to, int tolen); }
-134	AUE_NULL	NOPROTO	{ int shutdown(int s, int how); }
+134	AUE_NULL	MNOPROTO	{ int shutdown(int s, int how); }
 135	AUE_NULL	UNIMPL	socketpair
-136	AUE_NULL	NOPROTO	{ int mkdir(char *path, int mode); }
-137	AUE_NULL	NOPROTO	{ int rmdir(char *path); }
-138	AUE_NULL	NOPROTO	{ int utimes(char *path, \
+136	AUE_NULL	MNOPROTO	{ int mkdir(char *path, int mode); }
+137	AUE_NULL	MNOPROTO	{ int rmdir(char *path); }
+138	AUE_NULL	MNOPROTO	{ int utimes(char *path, \
 				    struct timeval *tptr); }
 139	AUE_NULL	OBSOL	4.2 sigreturn
 140	AUE_NULL	UNIMPL	adjtime
-141	AUE_NULL	NOPROTO	{ int ogetpeername(int fdes, caddr_t asa, \
+141	AUE_NULL	MNOPROTO	{ int ogetpeername(int fdes, caddr_t asa, \
 				    int *alen); }
 142	AUE_NULL	MNOPROTO { int32_t ogethostid(void); }
 143	AUE_NULL	MNOPROTO { int osethostid(int32_t hostid); }
@@ -261,7 +261,7 @@
 147	AUE_NULL	MNOPROTO { int setsid(void); }
 148	AUE_NULL	UNIMPL	quotactl
 149	AUE_NULL	MNOPROTO { int oquota(void); }
-150	AUE_NULL	NOPROTO	{ int ogetsockname(int fdec, caddr_t asa, \
+150	AUE_NULL	MNOPROTO	{ int ogetsockname(int fdec, caddr_t asa, \
 				    int *alen);} ogetsockname \
 				    getsockname_args int
 151	AUE_NULL	UNIMPL
@@ -277,9 +277,9 @@
 158	AUE_NULL	UNIMPL	nfssvc
 159	AUE_NULL	NOPROTO	{ int ogetdirentries(int fd, char *buf, \
 				    u_int count, long *basep); }
-160     AUE_NULL	STD	{ int osf1_statfs(char *path, \
+160     AUE_NULL	MSTD	{ int osf1_statfs(char *path, \
 				    struct osf1_statfs *buf, int len); }
-161     AUE_NULL	STD	{ int osf1_fstatfs(int fd, \
+161     AUE_NULL	MSTD	{ int osf1_fstatfs(int fd, \
 				    struct osf1_statfs *buf, int len); }
 162	AUE_NULL	UNIMPL
 163	AUE_NULL	UNIMPL	async_daemon
@@ -335,7 +335,7 @@
 206	AUE_NULL	MNOPROTO { int semop(int semid, struct sembuf *sops, \
 				    u_int nsops); }
 207	AUE_NULL	MNOPROTO { int uname(struct utsname *name); }
-208	AUE_NULL	NOPROTO	{ int lchown(char *path, int uid, int gid); }
+208	AUE_NULL	MNOPROTO	{ int lchown(char *path, int uid, int gid); }
 209	AUE_NULL	MNOPROTO { int shmat(int shmid, void *shmaddr, \
 				    int shmflg); }
 210	AUE_NULL	MNOPROTO { int shmctl(int shmid, int cmd, \
@@ -347,9 +347,9 @@
 214	AUE_NULL	UNIMPL	getaddressconf
 215	AUE_NULL	UNIMPL	msleep
 216	AUE_NULL	UNIMPL	mwakeup
-217	AUE_NULL	STD	{ int osf1_msync(caddr_t addr, size_t len, \
+217	AUE_NULL	MSTD	{ int osf1_msync(caddr_t addr, size_t len, \
 				    int flags); }
-218	AUE_NULL	MSTD	{int osf1_signal(int signum, void *handler); }
+218	AUE_NULL	MSTD	{ int osf1_signal(int signum, void *handler); }
 219	AUE_NULL	UNIMPL	utc gettime
 220	AUE_NULL	UNIMPL	utc adjtime
 221	AUE_NULL	UNIMPL
@@ -378,24 +378,24 @@
 				    long count); }
 242	AUE_NULL	UNIMPL	uadmin
 243	AUE_NULL	UNIMPL	fuser
-244	AUE_NULL	STD	{ int osf1_proplist_syscall(void); }
-245	AUE_NULL	STD	{ int osf1_ntpadjtime(void *tp); }
-246	AUE_NULL	STD	{ int osf1_ntpgettime(void *tp); }
-247	AUE_NULL	STD	{ int osf1_pathconf(char *path, int name); }
-248	AUE_NULL	STD	{ int osf1_fpathconf(int fd, int name); }
+244	AUE_NULL	MSTD	{ int osf1_proplist_syscall(void); }
+245	AUE_NULL	MSTD	{ int osf1_ntpadjtime(void *tp); }
+246	AUE_NULL	MSTD	{ int osf1_ntpgettime(void *tp); }
+247	AUE_NULL	MSTD	{ int osf1_pathconf(char *path, int name); }
+248	AUE_NULL	MSTD	{ int osf1_fpathconf(int fd, int name); }
 249	AUE_NULL	UNIMPL
 250	AUE_NULL	STD	{ int osf1_uswitch(long cmd, long mask); }
-251	AUE_NULL	STD	{ int osf1_usleep_thread( \
+251	AUE_NULL	MSTD	{ int osf1_usleep_thread( \
 				    struct timeval *sleep, \
 				    struct timeval *slept); }
 252	AUE_NULL	UNIMPL	audcntl
 253	AUE_NULL	UNIMPL	audgen
 254	AUE_NULL	UNIMPL	sysfs
 255	AUE_NULL	UNIMPL
-256	AUE_NULL	STD	{ int osf1_getsysinfo(u_long op, \
+256	AUE_NULL	MSTD	{ int osf1_getsysinfo(u_long op, \
 				    caddr_t buffer, u_long nbytes, \
 				    caddr_t arg, u_long flag); }
-257	AUE_NULL	STD	{ int osf1_setsysinfo(u_long op, \
+257	AUE_NULL	MSTD	{ int osf1_setsysinfo(u_long op, \
 				    caddr_t buffer, u_long nbytes, \
 				    caddr_t arg, u_long flag); }
 258	AUE_NULL	UNIMPL	afs_syscall