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.

7 files changed, 394 insertions, 415 deletions

diff --git a/sys/i386/i386/trap.c b/sys/i386/i386/trap.c
index da3ed95..1481b15 100644
--- a/sys/i386/i386/trap.c
+++ b/sys/i386/i386/trap.c
@@ -994,13 +994,6 @@ syscall(frame)
 	CTR4(KTR_SYSC, "syscall enter thread %p pid %d proc %s code %d", td,
 	    td->td_proc->p_pid, td->td_proc->p_comm, code);
 
-	/*
-	 * Try to run the syscall without Giant if the syscall
-	 * is MP safe.
-	 */
-	if ((callp->sy_narg & SYF_MPSAFE) == 0)
-		mtx_lock(&Giant);
-
 	if (error == 0) {
 		td->td_retval[0] = 0;
 		td->td_retval[1] = frame.tf_edx;
@@ -1045,12 +1038,6 @@ syscall(frame)
 	}
 
 	/*
-	 * Release Giant if we previously set it.
-	 */
-	if ((callp->sy_narg & SYF_MPSAFE) == 0)
-		mtx_unlock(&Giant);
-
-	/*
 	 * Traced syscall.
 	 */
 	if ((orig_tf_eflags & PSL_T) && !(orig_tf_eflags & PSL_VM)) {
diff --git a/sys/i386/ibcs2/ibcs2_isc.c b/sys/i386/ibcs2/ibcs2_isc.c
index e2638a3..adafc99 100644
--- a/sys/i386/ibcs2/ibcs2_isc.c
+++ b/sys/i386/ibcs2/ibcs2_isc.c
@@ -58,13 +58,9 @@ ibcs2_isc(struct thread *td, struct ibcs2_isc_args *uap)
 	code = (tf->tf_eax & 0xffffff00) >> 8;
 	callp = &isc_sysent[code];
 
-	if (code < IBCS2_ISC_MAXSYSCALL) {
-		if ((callp->sy_narg & SYF_MPSAFE) == 0)
-			mtx_lock(&Giant);
+	if (code < IBCS2_ISC_MAXSYSCALL)
 		error = (*callp->sy_call)(td, (void *)uap);
-		if ((callp->sy_narg & SYF_MPSAFE) == 0)
-			mtx_unlock(&Giant);
-	} else
+	else
 		error = ENOSYS;
 	return (error);
 }
diff --git a/sys/i386/ibcs2/ibcs2_xenix.c b/sys/i386/ibcs2/ibcs2_xenix.c
index 33f0dda..94a4eae 100644
--- a/sys/i386/ibcs2/ibcs2_xenix.c
+++ b/sys/i386/ibcs2/ibcs2_xenix.c
@@ -69,13 +69,9 @@ ibcs2_xenix(struct thread *td, struct ibcs2_xenix_args *uap)
 	code = (tf->tf_eax & 0xff00) >> 8;
 	callp = &xenix_sysent[code];
 
-	if (code < IBCS2_XENIX_MAXSYSCALL) {
-		if ((callp->sy_narg & SYF_MPSAFE) == 0)
-			mtx_lock(&Giant);
+	if (code < IBCS2_XENIX_MAXSYSCALL)
 		error = ((*callp->sy_call)(td, (void *)uap));
-		if ((callp->sy_narg & SYF_MPSAFE) == 0)
-			mtx_unlock(&Giant);
-	} else
+	else
 		error = ENOSYS;
 	return (error);
 }
diff --git a/sys/i386/ibcs2/syscalls.isc b/sys/i386/ibcs2/syscalls.isc
index 71ae5dc..b6f87f9 100644
--- a/sys/i386/ibcs2/syscalls.isc
+++ b/sys/i386/ibcs2/syscalls.isc
@@ -10,29 +10,29 @@
 
 0	AUE_NULL	UNIMPL	nosys
 1	AUE_NULL	UNIMPL	isc_setostype
-2	AUE_RENAME	MNOPROTO	{ int ibcs2_rename(char *from, char *to); }
-3	AUE_NULL	MNOPROTO	{ int ibcs2_sigaction(int sig, \
+2	AUE_RENAME	NOPROTO	{ int ibcs2_rename(char *from, char *to); }
+3	AUE_NULL	NOPROTO	{ int ibcs2_sigaction(int sig, \
 				    struct ibcs2_sigaction *act, \
 				    struct ibcs2_sigaction *oact); }
-4	AUE_NULL	MNOPROTO	{ int ibcs2_sigprocmask(int how, \
+4	AUE_NULL	NOPROTO	{ int ibcs2_sigprocmask(int how, \
 				    ibcs2_sigset_t *set, \
 				    ibcs2_sigset_t *oset); }
-5	AUE_NULL	MNOPROTO	{ int ibcs2_sigpending(ibcs2_sigset_t *mask); }
-6	AUE_GETGROUPS	MNOPROTO	{ int getgroups(u_int gidsetsize, \
+5	AUE_NULL	NOPROTO	{ int ibcs2_sigpending(ibcs2_sigset_t *mask); }
+6	AUE_GETGROUPS	NOPROTO	{ int getgroups(u_int gidsetsize, \
 				    gid_t *gidset); }
-7	AUE_SETGROUPS	MNOPROTO	{ int setgroups(u_int gidsetsize, \
+7	AUE_SETGROUPS	NOPROTO	{ int setgroups(u_int gidsetsize, \
 				    gid_t *gidset); }
-8	AUE_PATHCONF	MNOPROTO	{ int ibcs2_pathconf(char *path, int name); }
-9	AUE_FPATHCONF	MNOPROTO	{ int ibcs2_fpathconf(int fd, int name); }
+8	AUE_PATHCONF	NOPROTO	{ int ibcs2_pathconf(char *path, int name); }
+9	AUE_FPATHCONF	NOPROTO	{ int ibcs2_fpathconf(int fd, int name); }
 10	AUE_NULL	UNIMPL	nosys
-11	AUE_WAIT4	MNOPROTO	{ int ibcs2_wait(int a1, int a2, int a3); }
-12	AUE_SETSID	MNOPROTO	{ int setsid(void); }
-13	AUE_GETPID	MNOPROTO	{ pid_t getpid(void); }
+11	AUE_WAIT4	NOPROTO	{ int ibcs2_wait(int a1, int a2, int a3); }
+12	AUE_SETSID	NOPROTO	{ int setsid(void); }
+13	AUE_GETPID	NOPROTO	{ pid_t getpid(void); }
 14	AUE_NULL	UNIMPL	isc_adduser
 15	AUE_NULL	UNIMPL	isc_setuser
-16	AUE_NULL	MNOPROTO { int ibcs2_sysconf(int name); }
-17	AUE_NULL	MNOPROTO	{ int ibcs2_sigsuspend(ibcs2_sigset_t *mask); }
-18	AUE_SYMLINK	MNOPROTO	{ int ibcs2_symlink(char *path, char *link); }
-19	AUE_READLINK	MNOPROTO	{ int ibcs2_readlink(char *path, char *buf, \
+16	AUE_NULL	NOPROTO	{ int ibcs2_sysconf(int name); }
+17	AUE_NULL	NOPROTO	{ int ibcs2_sigsuspend(ibcs2_sigset_t *mask); }
+18	AUE_SYMLINK	NOPROTO	{ int ibcs2_symlink(char *path, char *link); }
+19	AUE_READLINK	NOPROTO	{ int ibcs2_readlink(char *path, char *buf, \
 				    int count); }
 20	AUE_NULL	UNIMPL	isc_getmajor
diff --git a/sys/i386/ibcs2/syscalls.master b/sys/i386/ibcs2/syscalls.master
index ff74f48..274a829 100644
--- a/sys/i386/ibcs2/syscalls.master
+++ b/sys/i386/ibcs2/syscalls.master
@@ -35,100 +35,100 @@
 
 ; #ifdef's, etc. may be included, and are copied to the output files.
 
-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_NULL	MSTD	{ int ibcs2_read(int fd, char *buf, \
+2	AUE_FORK	NOPROTO	{ int fork(void); }
+3	AUE_NULL	STD	{ int ibcs2_read(int fd, char *buf, \
 				    u_int nbytes); }
-4	AUE_NULL	MNOPROTO { int write(int fd, char *buf, \
+4	AUE_NULL	NOPROTO	{ int write(int fd, char *buf, \
 				    u_int nbytes); }
-5	AUE_OPEN_RWTC	MSTD	{ int ibcs2_open(char *path, int flags, \
+5	AUE_OPEN_RWTC	STD	{ int ibcs2_open(char *path, int flags, \
 				    int mode); }
-6	AUE_CLOSE	MNOPROTO { int close(int fd); }
-7	AUE_WAIT4	MSTD	{ int ibcs2_wait(int a1, int a2, int a3); }
-8	AUE_CREAT	MSTD	{ int ibcs2_creat(char *path, int mode); }
-9	AUE_LINK	MNOPROTO	{ int link(char *path, char *link); }
-10	AUE_UNLINK	MSTD	{ int ibcs2_unlink(char *path); }
-11	AUE_EXECVE	MSTD	{ int ibcs2_execv(char *path, char **argp); }
-12	AUE_CHDIR	MSTD	{ int ibcs2_chdir(char *path); }
-13	AUE_NULL	MSTD	{ int ibcs2_time(ibcs2_time_t *tp); }
-14	AUE_MKNOD	MSTD	{ int ibcs2_mknod(char* path, int mode, \
+6	AUE_CLOSE	NOPROTO	{ int close(int fd); }
+7	AUE_WAIT4	STD	{ int ibcs2_wait(int a1, int a2, int a3); }
+8	AUE_CREAT	STD	{ int ibcs2_creat(char *path, int mode); }
+9	AUE_LINK	NOPROTO	{ int link(char *path, char *link); }
+10	AUE_UNLINK	STD	{ int ibcs2_unlink(char *path); }
+11	AUE_EXECVE	STD	{ int ibcs2_execv(char *path, char **argp); }
+12	AUE_CHDIR	STD	{ int ibcs2_chdir(char *path); }
+13	AUE_NULL	STD	{ int ibcs2_time(ibcs2_time_t *tp); }
+14	AUE_MKNOD	STD	{ int ibcs2_mknod(char* path, int mode, \
 				    int dev); }
-15	AUE_CHMOD	MSTD	{ int ibcs2_chmod(char *path, int mode); }
-16	AUE_CHOWN	MSTD	{ int ibcs2_chown(char *path, int uid, \
+15	AUE_CHMOD	STD	{ int ibcs2_chmod(char *path, int mode); }
+16	AUE_CHOWN	STD	{ int ibcs2_chown(char *path, int uid, \
 				    int gid); }
-17	AUE_NULL	MNOPROTO	{ int obreak(caddr_t nsize); }
-18	AUE_STAT	MSTD	{ int ibcs2_stat(char* path, \
+17	AUE_NULL	NOPROTO	{ int obreak(caddr_t nsize); }
+18	AUE_STAT	STD	{ int ibcs2_stat(char* path, \
 				    struct ibcs2_stat *st); }
-19	AUE_LSEEK	MSTD	{ long ibcs2_lseek(int fd, long offset, \
+19	AUE_LSEEK	STD	{ long ibcs2_lseek(int fd, long offset, \
 				    int whence); }
-20	AUE_NULL	MNOPROTO { pid_t getpid(void); }
-21	AUE_MOUNT	MSTD	{ int ibcs2_mount(char *special, char *dir, \
+20	AUE_NULL	NOPROTO	{ pid_t getpid(void); }
+21	AUE_MOUNT	STD	{ int ibcs2_mount(char *special, char *dir, \
 				    int flags, int fstype, char *data, \
 				    int len); }
-22	AUE_UMOUNT	MSTD	{ int ibcs2_umount(char *name); }
-23	AUE_SETUID	MSTD	{ int ibcs2_setuid(int uid); }
-24	AUE_GETUID	MNOPROTO { uid_t getuid(void); }
-25	AUE_SETTIMEOFDAY	MSTD	{ int ibcs2_stime(long *timep); }
-26	AUE_PTRACE	MNOPROTO { int ptrace(int req, pid_t pid, \
+22	AUE_UMOUNT	STD	{ int ibcs2_umount(char *name); }
+23	AUE_SETUID	STD	{ int ibcs2_setuid(int uid); }
+24	AUE_GETUID	NOPROTO	{ uid_t getuid(void); }
+25	AUE_SETTIMEOFDAY	STD	{ int ibcs2_stime(long *timep); }
+26	AUE_PTRACE	NOPROTO	{ int ptrace(int req, pid_t pid, \
 				    caddr_t addr, int data); }
-27	AUE_NULL	MSTD	{ int ibcs2_alarm(unsigned sec); }
-28	AUE_FSTAT	MSTD	{ int ibcs2_fstat(int fd, \
+27	AUE_NULL	STD	{ int ibcs2_alarm(unsigned sec); }
+28	AUE_FSTAT	STD	{ int ibcs2_fstat(int fd, \
 				    struct ibcs2_stat *st); }
-29	AUE_NULL	MSTD	{ int ibcs2_pause(void); }
-30	AUE_NULL	MSTD	{ int ibcs2_utime(char *path, \
+29	AUE_NULL	STD	{ int ibcs2_pause(void); }
+30	AUE_NULL	STD	{ int ibcs2_utime(char *path, \
 				    struct ibcs2_utimbuf *buf); }
-31	AUE_NULL	MSTD	{ int ibcs2_stty(int fd, \
+31	AUE_NULL	STD	{ int ibcs2_stty(int fd, \
 				    struct sgttyb *buf); }
-32	AUE_NULL	MSTD	{ int ibcs2_gtty(int fd, \
+32	AUE_NULL	STD	{ int ibcs2_gtty(int fd, \
 				    struct sgttyb *buf); }
-33	AUE_ACCESS	MSTD	{ int ibcs2_access(char *path, int flags); }
-34	AUE_NICE	MSTD	{ int ibcs2_nice(int incr); }
-35	AUE_STATFS	MSTD	{ int ibcs2_statfs(char *path, \
+33	AUE_ACCESS	STD	{ int ibcs2_access(char *path, int flags); }
+34	AUE_NICE	STD	{ int ibcs2_nice(int incr); }
+35	AUE_STATFS	STD	{ int ibcs2_statfs(char *path, \
 				    struct ibcs2_statfs *buf, int len, \
 				    int fstype); }
-36	AUE_NULL	MNOPROTO	{ int sync(void); }
-37	AUE_KILL	MSTD	{ int ibcs2_kill(int pid, int signo); }
-38	AUE_FSTATFS	MSTD	{ int ibcs2_fstatfs(int fd, \
+36	AUE_NULL	NOPROTO	{ int sync(void); }
+37	AUE_KILL	STD	{ int ibcs2_kill(int pid, int signo); }
+38	AUE_FSTATFS	STD	{ int ibcs2_fstatfs(int fd, \
 				    struct ibcs2_statfs *buf, int len, \
 				    int fstype); }
-39	AUE_NULL	MSTD	{ int ibcs2_pgrpsys(int type, caddr_t dummy, \
+39	AUE_NULL	STD	{ int ibcs2_pgrpsys(int type, caddr_t dummy, \
 				    int pid, int pgid); }
-40	AUE_NULL	MSTD	{ int ibcs2_xenix(int a1, int a2, int a3, \
+40	AUE_NULL	STD	{ int ibcs2_xenix(int a1, int a2, int a3, \
 				    int a4, int a5); }
-41	AUE_NULL	MNOPROTO { int dup(u_int fd); }
-42	AUE_PIPE	MNOPROTO { int pipe(void); }
-43	AUE_NULL	MSTD	{ int ibcs2_times(struct tms *tp); }
-44	AUE_PROFILE	MNOPROTO { int profil(caddr_t samples, u_int size, \
+41	AUE_NULL	NOPROTO	{ int dup(u_int fd); }
+42	AUE_PIPE	NOPROTO	{ int pipe(void); }
+43	AUE_NULL	STD	{ int ibcs2_times(struct tms *tp); }
+44	AUE_PROFILE	NOPROTO	{ int profil(caddr_t samples, u_int size, \
 				    u_int offset, u_int scale); }
-45	AUE_NULL	MSTD	{ int ibcs2_plock(int cmd); }
-46	AUE_SETGID	MSTD	{ int ibcs2_setgid(int gid); }
-47	AUE_GETGID	MNOPROTO { gid_t getgid(void); }
-48	AUE_NULL	MSTD	{ int ibcs2_sigsys(int sig, ibcs2_sig_t fp); }
-49	AUE_MSGSYS	MSTD	{ int ibcs2_msgsys(int which, int a2, \
+45	AUE_NULL	STD	{ int ibcs2_plock(int cmd); }
+46	AUE_SETGID	STD	{ int ibcs2_setgid(int gid); }
+47	AUE_GETGID	NOPROTO	{ gid_t getgid(void); }
+48	AUE_NULL	STD	{ int ibcs2_sigsys(int sig, ibcs2_sig_t fp); }
+49	AUE_MSGSYS	STD	{ int ibcs2_msgsys(int which, int a2, \
 				    int a3, int a4, int a5, int a6); }
-50	AUE_NULL	MSTD	{ int ibcs2_sysi86(int cmd, int *arg); }
+50	AUE_NULL	STD	{ int ibcs2_sysi86(int cmd, int *arg); }
 51	AUE_NULL	UNIMPL	ibcs2_acct
-52	AUE_SHMSYS	MSTD	{ int ibcs2_shmsys(int which, int a2, \
+52	AUE_SHMSYS	STD	{ int ibcs2_shmsys(int which, int a2, \
 				    int a3, int a4); }
-53	AUE_SEMSYS	MSTD	{ int ibcs2_semsys(int which, int a2, \
+53	AUE_SEMSYS	STD	{ int ibcs2_semsys(int which, int a2, \
 				    int a3, int a4, int a5); }
-54	AUE_IOCTL	MSTD	{ int ibcs2_ioctl(int fd, int cmd, \
+54	AUE_IOCTL	STD	{ int ibcs2_ioctl(int fd, int cmd, \
 				    caddr_t data); }
-55	AUE_NULL	MSTD	{ int ibcs2_uadmin(int cmd, int func, \
+55	AUE_NULL	STD	{ int ibcs2_uadmin(int cmd, int func, \
 				    caddr_t data); }
 56	AUE_NULL	UNIMPL	nosys
-57	AUE_NULL	MSTD	{ int ibcs2_utssys(int a1, int a2, \
+57	AUE_NULL	STD	{ int ibcs2_utssys(int a1, int a2, \
 				    int flag); }
-58      AUE_FSYNC	MNOPROTO { int fsync(int fd); }
-59	AUE_EXECVE	MSTD	{ int ibcs2_execve(char *path, char **argp, \
+58      AUE_FSYNC	NOPROTO	{ int fsync(int fd); }
+59	AUE_EXECVE	STD	{ int ibcs2_execve(char *path, char **argp, \
 				    char **envp); }
-60	AUE_UMASK	MNOPROTO { int umask(int newmask); }
-61	AUE_CHROOT	MNOPROTO	{ int chroot(char *path); }
-62	AUE_FCNTL	MSTD	{ int ibcs2_fcntl(int fd, int cmd, \
+60	AUE_UMASK	NOPROTO	{ int umask(int newmask); }
+61	AUE_CHROOT	NOPROTO	{ int chroot(char *path); }
+62	AUE_FCNTL	STD	{ int ibcs2_fcntl(int fd, int cmd, \
 				    char *arg); }
-63	AUE_NULL	MSTD	{ long ibcs2_ulimit(int cmd, int newlimit); }
+63	AUE_NULL	STD	{ long ibcs2_ulimit(int cmd, int newlimit); }
 64	AUE_NULL	UNIMPL	reserved for unix/pc
 65	AUE_NULL	UNIMPL	reserved for unix/pc
 66	AUE_NULL	UNIMPL	reserved for unix/pc
@@ -144,30 +144,30 @@
 76	AUE_NULL	OBSOL	rfs_rdebug
 77	AUE_NULL	OBSOL	rfs_rfstop
 78	AUE_NULL	UNIMPL	rfs_rfsys
-79	AUE_RMDIR	MSTD	{ int ibcs2_rmdir(char *path); }
-80	AUE_MKDIR	MSTD	{ int ibcs2_mkdir(char *path, int mode); }
-81	AUE_GETDIRENTRIES	MSTD	{ int ibcs2_getdents(int fd, char *buf, \
+79	AUE_RMDIR	STD	{ int ibcs2_rmdir(char *path); }
+80	AUE_MKDIR	STD	{ int ibcs2_mkdir(char *path, int mode); }
+81	AUE_GETDIRENTRIES	STD	{ int ibcs2_getdents(int fd, char *buf, \
 				    int nbytes); }
 82	AUE_NULL	UNIMPL	nosys
 83	AUE_NULL	UNIMPL	nosys
-84	AUE_NULL	MSTD	{ int ibcs2_sysfs(int cmd, caddr_t d1, \
+84	AUE_NULL	STD	{ int ibcs2_sysfs(int cmd, caddr_t d1, \
 				    char *buf); }
-85	AUE_GETMSG	MSTD	{ int ibcs2_getmsg(int fd, \
+85	AUE_GETMSG	STD	{ int ibcs2_getmsg(int fd, \
 				    struct ibcs2_stropts *ctl, \
 				    struct ibcs2_stropts *dat, int *flags); }
-86	AUE_PUTMSG	MSTD	{ int ibcs2_putmsg(int fd, \
+86	AUE_PUTMSG	STD	{ int ibcs2_putmsg(int fd, \
 				    struct ibcs2_stropts *ctl, \
 				    struct ibcs2_stropts *dat, int flags); }
-87	AUE_POLL	MNOPROTO { int poll(struct pollfd *fds, u_int nfds, \
+87	AUE_POLL	NOPROTO	{ int poll(struct pollfd *fds, u_int nfds, \
 				    int timeout); }
 88	AUE_NULL	UNIMPL	nosys
-89	AUE_NULL	MSTD	{ int ibcs2_secure(int cmd, int a1, int a2, \
+89	AUE_NULL	STD	{ int ibcs2_secure(int cmd, int a1, int a2, \
 				    int a3, int a4, int a5); }
-90	AUE_SYMLINK	MSTD	{ int ibcs2_symlink(char *path, \
+90	AUE_SYMLINK	STD	{ int ibcs2_symlink(char *path, \
 				    char *link); }
-91	AUE_LSTAT	MSTD	{ int ibcs2_lstat(char *path, \
+91	AUE_LSTAT	STD	{ int ibcs2_lstat(char *path, \
 				    struct ibcs2_stat *st); }
-92	AUE_READLINK	MSTD	{ int ibcs2_readlink(char *path, char *buf, \
+92	AUE_READLINK	STD	{ int ibcs2_readlink(char *path, char *buf, \
 				    int count); }
 93	AUE_NULL	UNIMPL	nosys
 94	AUE_NULL	UNIMPL	nosys
@@ -179,10 +179,10 @@
 100	AUE_NULL	UNIMPL	nosys
 101	AUE_NULL	UNIMPL	nosys
 102	AUE_NULL	UNIMPL	nosys
-103	AUE_NULL	MNOPROTO { int sigreturn( \
+103	AUE_NULL	NOPROTO	{ int sigreturn( \
 				    struct sigcontext *sigcntxp); }
 104	AUE_NULL	UNIMPL	nosys
-105	AUE_NULL	MSTD	{ int ibcs2_isc(void); }
+105	AUE_NULL	STD	{ int ibcs2_isc(void); }
 106	AUE_NULL	UNIMPL	nosys
 107	AUE_NULL	UNIMPL	nosys
 108	AUE_NULL	UNIMPL	nosys
diff --git a/sys/i386/ibcs2/syscalls.xenix b/sys/i386/ibcs2/syscalls.xenix
index 2fc1838..bb43c18 100644
--- a/sys/i386/ibcs2/syscalls.xenix
+++ b/sys/i386/ibcs2/syscalls.xenix
@@ -14,12 +14,12 @@
 4	AUE_NULL	UNIMPL	xenix_sigsem
 5	AUE_NULL	UNIMPL	xenix_waitsem
 6	AUE_NULL	UNIMPL	xenix_nbwaitsem
-7	AUE_NULL	MSTD	{ int xenix_rdchk(int fd); }
+7	AUE_NULL	STD	{ int xenix_rdchk(int fd); }
 8	AUE_NULL	UNIMPL	nosys
 9	AUE_NULL	UNIMPL	nosys
-10	AUE_FTRUNCATE	MSTD	{ int xenix_chsize(int fd, long size); }
-11	AUE_NULL	MSTD	{ int xenix_ftime(struct timeb *tp); }
-12	AUE_NULL	MSTD	{ int xenix_nap(int millisec); }
+10	AUE_FTRUNCATE	STD	{ int xenix_chsize(int fd, long size); }
+11	AUE_NULL	STD	{ int xenix_ftime(struct timeb *tp); }
+12	AUE_NULL	STD	{ int xenix_nap(int millisec); }
 13	AUE_NULL	UNIMPL	xenix_sdget
 14	AUE_NULL	UNIMPL	xenix_sdfree
 15	AUE_NULL	UNIMPL	xenix_sdenter
@@ -28,7 +28,7 @@
 18	AUE_NULL	UNIMPL	xenix_sdwaitv
 19	AUE_NULL	UNIMPL	nosys
 20	AUE_NULL	UNIMPL	nosys
-21	AUE_NULL	MSTD	{ int xenix_scoinfo(void); }
+21	AUE_NULL	STD	{ int xenix_scoinfo(void); }
 22	AUE_NULL	UNIMPL	nosys
 23	AUE_NULL	UNIMPL	nosys
 24	AUE_NULL	UNIMPL	nosys
@@ -43,35 +43,35 @@
 33	AUE_NULL	UNIMPL	xenix_execseg
 34	AUE_NULL	UNIMPL	xenix_unexecseg
 35	AUE_NULL	UNIMPL	nosys
-36	AUE_SELECT	MNOPROTO	{ int select(u_int nd, fd_set *in, \
+36	AUE_SELECT	NOPROTO	{ int select(u_int nd, fd_set *in, \
 				    fd_set *ou, fd_set *ex, \
 				    struct timeval *tv); }
-37	AUE_EACCESS	MSTD	{ int xenix_eaccess(char *path, int flags); }
+37	AUE_EACCESS	STD	{ int xenix_eaccess(char *path, int flags); }
 38	AUE_NULL	UNIMPL	xenix_paccess
-39	AUE_NULL	MSTD	{ int ibcs2_sigaction(int sig, \
+39	AUE_NULL	STD	{ int ibcs2_sigaction(int sig, \
 				    struct ibcs2_sigaction *act, \
 				    struct ibcs2_sigaction *oact); }
-40	AUE_NULL	MSTD	{ int ibcs2_sigprocmask(int how, \
+40	AUE_NULL	STD	{ int ibcs2_sigprocmask(int how, \
 				    ibcs2_sigset_t *set, \
 				    ibcs2_sigset_t *oset); }
-41	AUE_NULL	MSTD	{ int ibcs2_sigpending(ibcs2_sigset_t *mask); }
-42	AUE_NULL	MSTD	{ int ibcs2_sigsuspend(ibcs2_sigset_t *mask); }
-43	AUE_GETGROUPS	MSTD	{ int ibcs2_getgroups(int gidsetsize, \
+41	AUE_NULL	STD	{ int ibcs2_sigpending(ibcs2_sigset_t *mask); }
+42	AUE_NULL	STD	{ int ibcs2_sigsuspend(ibcs2_sigset_t *mask); }
+43	AUE_GETGROUPS	STD	{ int ibcs2_getgroups(int gidsetsize, \
 				    ibcs2_gid_t *gidset); }
-44	AUE_SETGROUPS	MSTD	{ int ibcs2_setgroups(int gidsetsize, \
+44	AUE_SETGROUPS	STD	{ int ibcs2_setgroups(int gidsetsize, \
 				    ibcs2_gid_t *gidset); }
-45	AUE_NULL	MSTD	{ int ibcs2_sysconf(int name); }
-46	AUE_PATHCONF	MSTD	{ int ibcs2_pathconf(char *path, int name); }
-47	AUE_FPATHCONF	MSTD	{ int ibcs2_fpathconf(int fd, int name); }
-48	AUE_RENAME	MSTD	{ int ibcs2_rename(char *from, char *to); }
+45	AUE_NULL	STD	{ int ibcs2_sysconf(int name); }
+46	AUE_PATHCONF	STD	{ int ibcs2_pathconf(char *path, int name); }
+47	AUE_FPATHCONF	STD	{ int ibcs2_fpathconf(int fd, int name); }
+48	AUE_RENAME	STD	{ int ibcs2_rename(char *from, char *to); }
 49	AUE_NULL	UNIMPL	nosys
-50	AUE_NULL	MSTD	{ int xenix_utsname(long addr); }
+50	AUE_NULL	STD	{ int xenix_utsname(long addr); }
 51	AUE_NULL	UNIMPL	nosys
 52	AUE_NULL	UNIMPL	nosys
 53	AUE_NULL	UNIMPL	nosys
 54	AUE_NULL	UNIMPL	nosys
-55	AUE_GETITIMER	MNOPROTO	{ int getitimer(u_int which, \
+55	AUE_GETITIMER	NOPROTO	{ int getitimer(u_int which, \
 				    struct itimerval *itv); }
-56	AUE_SETITIMER	MNOPROTO	{ int setitimer(u_int which, \
+56	AUE_SETITIMER	NOPROTO	{ int setitimer(u_int which, \
 				    struct itimerval *itv, \
 				    struct itimerval *otv); }
diff --git a/sys/i386/linux/syscalls.master b/sys/i386/linux/syscalls.master
index da2105f..7b91632 100644
--- a/sys/i386/linux/syscalls.master
+++ b/sys/i386/linux/syscalls.master
@@ -37,438 +37,438 @@
 ; #ifdef's, etc. may be included, and are copied to the output files.
 
 0	AUE_NULL	UNIMPL	setup
-1	AUE_EXIT	MNOPROTO { void sys_exit(int rval); } exit \
+1	AUE_EXIT	NOPROTO	{ void sys_exit(int rval); } exit \
 				    sys_exit_args void
-2	AUE_FORK	MSTD	{ int linux_fork(void); }
-3	AUE_NULL	MNOPROTO { int read(int fd, char *buf, \
+2	AUE_FORK	STD	{ int linux_fork(void); }
+3	AUE_NULL	NOPROTO	{ int read(int fd, char *buf, \
 				    u_int nbyte); }
-4	AUE_NULL	MNOPROTO { int write(int fd, char *buf, \
+4	AUE_NULL	NOPROTO	{ int write(int fd, char *buf, \
 				    u_int nbyte); }
-5	AUE_OPEN_RWTC	MSTD	{ int linux_open(char *path, l_int flags, \
+5	AUE_OPEN_RWTC	STD	{ int linux_open(char *path, l_int flags, \
 				    l_int mode); }
-6	AUE_CLOSE	MNOPROTO { int close(int fd); }
-7	AUE_WAIT4	MSTD	{ int linux_waitpid(l_pid_t pid, \
+6	AUE_CLOSE	NOPROTO	{ int close(int fd); }
+7	AUE_WAIT4	STD	{ int linux_waitpid(l_pid_t pid, \
 				    l_int *status, l_int options); }
-8	AUE_O_CREAT	MSTD	{ int linux_creat(char *path, \
+8	AUE_O_CREAT	STD	{ int linux_creat(char *path, \
 				    l_int mode); }
-9	AUE_LINK	MSTD	{ int linux_link(char *path, char *to); }
-10	AUE_UNLINK	MSTD	{ int linux_unlink(char *path); }
-11	AUE_EXECVE	MSTD	{ int linux_execve(char *path, char **argp, \
+9	AUE_LINK	STD	{ int linux_link(char *path, char *to); }
+10	AUE_UNLINK	STD	{ int linux_unlink(char *path); }
+11	AUE_EXECVE	STD	{ int linux_execve(char *path, char **argp, \
 				    char **envp); }
-12	AUE_CHDIR	MSTD	{ int linux_chdir(char *path); }
-13	AUE_NULL	MSTD	{ int linux_time(l_time_t *tm); }
-14	AUE_MKNOD	MSTD	{ int linux_mknod(char *path, l_int mode, \
+12	AUE_CHDIR	STD	{ int linux_chdir(char *path); }
+13	AUE_NULL	STD	{ int linux_time(l_time_t *tm); }
+14	AUE_MKNOD	STD	{ int linux_mknod(char *path, l_int mode, \
 				    l_dev_t dev); }
-15	AUE_CHMOD	MSTD	{ int linux_chmod(char *path, \
+15	AUE_CHMOD	STD	{ int linux_chmod(char *path, \
 				    l_mode_t mode); }
-16	AUE_LCHOWN	MSTD	{ int linux_lchown16(char *path, \
+16	AUE_LCHOWN	STD	{ int linux_lchown16(char *path, \
 				    l_uid16_t uid, l_gid16_t gid); }
 17	AUE_NULL	UNIMPL	break
-18	AUE_STAT	MSTD	{ int linux_stat(char *path, \
+18	AUE_STAT	STD	{ int linux_stat(char *path, \
 				    struct linux_stat *up); }
-19	AUE_LSEEK	MSTD	{ int linux_lseek(l_uint fdes, l_off_t off, \
+19	AUE_LSEEK	STD	{ int linux_lseek(l_uint fdes, l_off_t off, \
 				    l_int whence); }
-20	AUE_GETPID	MSTD	{ int linux_getpid(void); }
-21	AUE_MOUNT	MSTD	{ int linux_mount(char *specialfile, \
+20	AUE_GETPID	STD	{ int linux_getpid(void); }
+21	AUE_MOUNT	STD	{ int linux_mount(char *specialfile, \
 				    char *dir, char *filesystemtype, \
 				    l_ulong rwflag, void *data); }
-22	AUE_UMOUNT	MSTD	{ int linux_oldumount(char *path); }
-23	AUE_SETUID	MSTD	{ int linux_setuid16(l_uid16_t uid); }
-24	AUE_GETUID	MSTD	{ int linux_getuid16(void); }
-25	AUE_SETTIMEOFDAY	MSTD	{ int linux_stime(void); }
-26	AUE_PTRACE	MSTD	{ int linux_ptrace(l_long req, l_long pid, \
+22	AUE_UMOUNT	STD	{ int linux_oldumount(char *path); }
+23	AUE_SETUID	STD	{ int linux_setuid16(l_uid16_t uid); }
+24	AUE_GETUID	STD	{ int linux_getuid16(void); }
+25	AUE_SETTIMEOFDAY	STD	{ int linux_stime(void); }
+26	AUE_PTRACE	STD	{ int linux_ptrace(l_long req, l_long pid, \
 				    l_long addr, l_long data); }
-27	AUE_NULL	MSTD	{ int linux_alarm(l_uint secs); }
-28	AUE_FSTAT	MSTD	{ int linux_fstat(l_uint fd, \
+27	AUE_NULL	STD	{ int linux_alarm(l_uint secs); }
+28	AUE_FSTAT	STD	{ int linux_fstat(l_uint fd, \
 				    struct linux_stat *up); }
-29	AUE_NULL	MSTD	{ int linux_pause(void); }
-30	AUE_UTIME	MSTD	{ int linux_utime(char *fname, \
+29	AUE_NULL	STD	{ int linux_pause(void); }
+30	AUE_UTIME	STD	{ int linux_utime(char *fname, \
 				    struct l_utimbuf *times); }
 31	AUE_NULL	UNIMPL	stty
 32	AUE_NULL	UNIMPL	gtty
-33	AUE_ACCESS	MSTD	{ int linux_access(char *path, l_int flags); }
-34	AUE_NICE	MSTD	{ int linux_nice(l_int inc); }
+33	AUE_ACCESS	STD	{ int linux_access(char *path, l_int flags); }
+34	AUE_NICE	STD	{ int linux_nice(l_int inc); }
 35	AUE_NULL	UNIMPL	ftime
-36	AUE_SYNC	MNOPROTO	{ int sync(void); }
-37	AUE_KILL	MSTD	{ int linux_kill(l_int pid, l_int signum); }
-38	AUE_RENAME	MSTD	{ int linux_rename(char *from, char *to); }
-39	AUE_MKDIR	MSTD	{ int linux_mkdir(char *path, l_int mode); }
-40	AUE_RMDIR	MSTD	{ int linux_rmdir(char *path); }
-41	AUE_DUP		MNOPROTO { int dup(u_int fd); }
-42	AUE_PIPE	MSTD	{ int linux_pipe(l_ulong *pipefds); }
-43	AUE_NULL	MSTD	{ int linux_times(struct l_times_argv *buf); }
+36	AUE_SYNC	NOPROTO	{ int sync(void); }
+37	AUE_KILL	STD	{ int linux_kill(l_int pid, l_int signum); }
+38	AUE_RENAME	STD	{ int linux_rename(char *from, char *to); }
+39	AUE_MKDIR	STD	{ int linux_mkdir(char *path, l_int mode); }
+40	AUE_RMDIR	STD	{ int linux_rmdir(char *path); }
+41	AUE_DUP		NOPROTO	{ int dup(u_int fd); }
+42	AUE_PIPE	STD	{ int linux_pipe(l_ulong *pipefds); }
+43	AUE_NULL	STD	{ int linux_times(struct l_times_argv *buf); }
 44	AUE_NULL	UNIMPL	prof
-45	AUE_NULL	MSTD	{ int linux_brk(l_ulong dsend); }
-46	AUE_SETGID	MSTD	{ int linux_setgid16(l_gid16_t gid); }
-47	AUE_GETGID	MSTD	{ int linux_getgid16(void); }
-48	AUE_NULL	MSTD	{ int linux_signal(l_int sig, \
+45	AUE_NULL	STD	{ int linux_brk(l_ulong dsend); }
+46	AUE_SETGID	STD	{ int linux_setgid16(l_gid16_t gid); }
+47	AUE_GETGID	STD	{ int linux_getgid16(void); }
+48	AUE_NULL	STD	{ int linux_signal(l_int sig, \
 				    l_handler_t handler); }
-49	AUE_GETEUID	MSTD	{ int linux_geteuid16(void); }
-50	AUE_GETEGID	MSTD	{ int linux_getegid16(void); }
-51	AUE_ACCT	MNOPROTO { int acct(char *path); }
-52	AUE_UMOUNT	MSTD	{ int linux_umount(char *path, l_int flags); }
+49	AUE_GETEUID	STD	{ int linux_geteuid16(void); }
+50	AUE_GETEGID	STD	{ int linux_getegid16(void); }
+51	AUE_ACCT	NOPROTO	{ int acct(char *path); }
+52	AUE_UMOUNT	STD	{ int linux_umount(char *path, l_int flags); }
 53	AUE_NULL	UNIMPL	lock
-54	AUE_IOCTL	MSTD	{ int linux_ioctl(l_uint fd, l_uint cmd, \
+54	AUE_IOCTL	STD	{ int linux_ioctl(l_uint fd, l_uint cmd, \
 				    l_ulong arg); }
-55	AUE_FCNTL	MSTD	{ int linux_fcntl(l_uint fd, l_uint cmd, \
+55	AUE_FCNTL	STD	{ int linux_fcntl(l_uint fd, l_uint cmd, \
 				    l_ulong arg); }
 56	AUE_NULL	UNIMPL	mpx
-57	AUE_SETPGRP	MNOPROTO { int setpgid(int pid, int pgid); }
+57	AUE_SETPGRP	NOPROTO	{ int setpgid(int pid, int pgid); }
 58	AUE_NULL	UNIMPL	ulimit
-59	AUE_NULL	MSTD	{ int linux_olduname(void); }
-60	AUE_UMASK	MNOPROTO { int umask(int newmask); }
-61	AUE_CHROOT	MNOPROTO	{ int chroot(char *path); }
-62	AUE_NULL	MSTD	{ int linux_ustat(l_dev_t dev, \
+59	AUE_NULL	STD	{ int linux_olduname(void); }
+60	AUE_UMASK	NOPROTO	{ int umask(int newmask); }
+61	AUE_CHROOT	NOPROTO	{ int chroot(char *path); }
+62	AUE_NULL	STD	{ int linux_ustat(l_dev_t dev, \
 				    struct l_ustat *ubuf); }
-63	AUE_DUP2	MNOPROTO { int dup2(u_int from, u_int to); }
-64	AUE_GETPPID	MNOPROTO { int getppid(void); }
-65	AUE_GETPGRP	MNOPROTO { int getpgrp(void); }
-66	AUE_SETSID	MNOPROTO { int setsid(void); }
-67	AUE_NULL	MSTD	{ int linux_sigaction(l_int sig, \
+63	AUE_DUP2	NOPROTO	{ int dup2(u_int from, u_int to); }
+64	AUE_GETPPID	NOPROTO	{ int getppid(void); }
+65	AUE_GETPGRP	NOPROTO	{ int getpgrp(void); }
+66	AUE_SETSID	NOPROTO	{ int setsid(void); }
+67	AUE_NULL	STD	{ int linux_sigaction(l_int sig, \
 				    l_osigaction_t *nsa, \
 				    l_osigaction_t *osa); }
-68	AUE_NULL	MSTD	{ int linux_sgetmask(void); }
-69	AUE_NULL	MSTD	{ int linux_ssetmask(l_osigset_t mask); }
-70	AUE_SETREUID	MSTD	{ int linux_setreuid16(l_uid16_t ruid, \
+68	AUE_NULL	STD	{ int linux_sgetmask(void); }
+69	AUE_NULL	STD	{ int linux_ssetmask(l_osigset_t mask); }
+70	AUE_SETREUID	STD	{ int linux_setreuid16(l_uid16_t ruid, \
 				    l_uid16_t euid); }
-71	AUE_SETREGID	MSTD	{ int linux_setregid16(l_gid16_t rgid, \
+71	AUE_SETREGID	STD	{ int linux_setregid16(l_gid16_t rgid, \
 				    l_gid16_t egid); }
-72	AUE_NULL	MSTD	{ int linux_sigsuspend(l_int hist0, \
+72	AUE_NULL	STD	{ int linux_sigsuspend(l_int hist0, \
 				    l_int hist1, l_osigset_t mask); }
-73	AUE_NULL	MSTD	{ int linux_sigpending(l_osigset_t *mask); }
-74	AUE_SYSCTL	MSTD	{ int linux_sethostname(char *hostname, \
+73	AUE_NULL	STD	{ int linux_sigpending(l_osigset_t *mask); }
+74	AUE_SYSCTL	STD	{ int linux_sethostname(char *hostname, \
 				    u_int len); }
-75	AUE_SETRLIMIT	MSTD	{ int linux_setrlimit(l_uint resource, \
+75	AUE_SETRLIMIT	STD	{ int linux_setrlimit(l_uint resource, \
 				    struct l_rlimit *rlim); }
-76	AUE_GETRLIMIT	MSTD	{ int linux_old_getrlimit(l_uint resource, \
+76	AUE_GETRLIMIT	STD	{ int linux_old_getrlimit(l_uint resource, \
 				    struct l_rlimit *rlim); }
-77	AUE_GETRUSAGE	MNOPROTO	{ int getrusage(int who, \
+77	AUE_GETRUSAGE	NOPROTO	{ int getrusage(int who, \
 				    struct rusage *rusage); }
-78	AUE_NULL	MNOPROTO { int gettimeofday( \
+78	AUE_NULL	NOPROTO	{ int gettimeofday( \
 				    struct timeval *tp, \
 				    struct timezone *tzp); }
-79	AUE_SETTIMEOFDAY	MNOPROTO { int settimeofday( \
+79	AUE_SETTIMEOFDAY	NOPROTO	{ int settimeofday( \
 				    struct timeval *tp, \
 				    struct timezone *tzp); }
-80	AUE_GETGROUPS	MSTD	{ int linux_getgroups16(l_uint gidsetsize, \
+80	AUE_GETGROUPS	STD	{ int linux_getgroups16(l_uint gidsetsize, \
 				    l_gid16_t *gidset); }
-81	AUE_SETGROUPS	MSTD	{ int linux_setgroups16(l_uint gidsetsize, \
+81	AUE_SETGROUPS	STD	{ int linux_setgroups16(l_uint gidsetsize, \
 				    l_gid16_t *gidset); }
-82	AUE_SELECT	MSTD	{ int linux_old_select( \
+82	AUE_SELECT	STD	{ int linux_old_select( \
 				    struct l_old_select_argv *ptr); }
-83	AUE_SYMLINK	MSTD	{ int linux_symlink(char *path, char *to); }
-84	AUE_LSTAT	MSTD	{ int linux_lstat(char *path, struct ostat *up); }
-85	AUE_READLINK	MSTD	{ int linux_readlink(char *name, char *buf, \
+83	AUE_SYMLINK	STD	{ int linux_symlink(char *path, char *to); }
+84	AUE_LSTAT	STD	{ int linux_lstat(char *path, struct ostat *up); }
+85	AUE_READLINK	STD	{ int linux_readlink(char *name, char *buf, \
 				    l_int count); }
-86	AUE_USELIB	MSTD	{ int linux_uselib(char *library); }
-87	AUE_SWAPON	MNOPROTO	{ int swapon(char *name); }
-88	AUE_REBOOT	MSTD	{ int linux_reboot(l_int magic1, \
+86	AUE_USELIB	STD	{ int linux_uselib(char *library); }
+87	AUE_SWAPON	NOPROTO	{ int swapon(char *name); }
+88	AUE_REBOOT	STD	{ int linux_reboot(l_int magic1, \
 				    l_int magic2, l_uint cmd, void *arg); }
-89	AUE_O_GETDENTS	MSTD	{ int linux_readdir(l_uint fd, \
+89	AUE_O_GETDENTS	STD	{ int linux_readdir(l_uint fd, \
 				    struct l_dirent *dent, l_uint count); }
-90	AUE_MMAP	MSTD	{ int linux_mmap(struct l_mmap_argv *ptr); }
-91	AUE_MUNMAP	MNOPROTO	{ int munmap(caddr_t addr, int len); }
-92	AUE_TRUNCATE	MSTD	{ int linux_truncate(char *path, \
+90	AUE_MMAP	STD	{ int linux_mmap(struct l_mmap_argv *ptr); }
+91	AUE_MUNMAP	NOPROTO	{ int munmap(caddr_t addr, int len); }
+92	AUE_TRUNCATE	STD	{ int linux_truncate(char *path, \
 				    l_ulong length); }
-93	AUE_FTRUNCATE	MSTD	{ int linux_ftruncate(int fd, long length); }
-94	AUE_FCHMOD	MNOPROTO	{ int fchmod(int fd, int mode); }
-95	AUE_FCHOWN	MNOPROTO	{ int fchown(int fd, int uid, int gid); }
-96	AUE_GETPRIORITY	MSTD	{ int linux_getpriority(int which, int who); }
-97	AUE_SETPRIORITY	MNOPROTO { int setpriority(int which, int who, \
+93	AUE_FTRUNCATE	STD	{ int linux_ftruncate(int fd, long length); }
+94	AUE_FCHMOD	NOPROTO	{ int fchmod(int fd, int mode); }
+95	AUE_FCHOWN	NOPROTO	{ int fchown(int fd, int uid, int gid); }
+96	AUE_GETPRIORITY	STD	{ int linux_getpriority(int which, int who); }
+97	AUE_SETPRIORITY	NOPROTO	{ int setpriority(int which, int who, \
 				    int prio); }
 98	AUE_AUE_PROFILE	UNIMPL	profil
-99	AUE_STATFS	MSTD	{ int linux_statfs(char *path, \
+99	AUE_STATFS	STD	{ int linux_statfs(char *path, \
 				    struct l_statfs_buf *buf); }
-100	AUE_FSTATFS	MSTD	{ int linux_fstatfs(l_uint fd, \
+100	AUE_FSTATFS	STD	{ int linux_fstatfs(l_uint fd, \
 				    struct l_statfs_buf *buf); }
-101	AUE_NULL	MSTD	{ int linux_ioperm(l_ulong start, \
+101	AUE_NULL	STD	{ int linux_ioperm(l_ulong start, \
 				    l_ulong length, l_int enable); }
-102	AUE_NULL	MSTD	{ int linux_socketcall(l_int what, \
+102	AUE_NULL	STD	{ int linux_socketcall(l_int what, \
 				    l_ulong args); }
-103	AUE_NULL	MSTD	{ int linux_syslog(l_int type, char *buf, \
+103	AUE_NULL	STD	{ int linux_syslog(l_int type, char *buf, \
 				    l_int len); }
-104	AUE_SETITIMER	MSTD	{ int linux_setitimer(l_int which, \
+104	AUE_SETITIMER	STD	{ int linux_setitimer(l_int which, \
 				    struct l_itimerval *itv, \
 				    struct l_itimerval *oitv); }
-105	AUE_GETITIMER	MSTD	{ int linux_getitimer(l_int which, \
+105	AUE_GETITIMER	STD	{ int linux_getitimer(l_int which, \
 				    struct l_itimerval *itv); }
-106	AUE_STAT	MSTD	{ int linux_newstat(char *path, \
+106	AUE_STAT	STD	{ int linux_newstat(char *path, \
 				    struct l_newstat *buf); }
-107	AUE_LSTAT	MSTD	{ int linux_newlstat(char *path, \
+107	AUE_LSTAT	STD	{ int linux_newlstat(char *path, \
 				    struct l_newstat *buf); }
-108	AUE_FSTAT	MSTD	{ int linux_newfstat(l_uint fd, \
+108	AUE_FSTAT	STD	{ int linux_newfstat(l_uint fd, \
 				    struct l_newstat *buf); }
-109	AUE_NULL	MSTD	{ int linux_uname(void); }
-110	AUE_NULL	MSTD	{ int linux_iopl(l_ulong level); }
-111	AUE_NULL	MSTD	{ int linux_vhangup(void); }
+109	AUE_NULL	STD	{ int linux_uname(void); }
+110	AUE_NULL	STD	{ int linux_iopl(l_ulong level); }
+111	AUE_NULL	STD	{ int linux_vhangup(void); }
 112	AUE_NULL	UNIMPL	idle
-113	AUE_NULL	MSTD	{ int linux_vm86old(void); }
-114	AUE_WAIT4	MSTD	{ int linux_wait4(l_pid_t pid, \
+113	AUE_NULL	STD	{ int linux_vm86old(void); }
+114	AUE_WAIT4	STD	{ int linux_wait4(l_pid_t pid, \
 				    l_uint *status, l_int options, \
 				    struct l_rusage *rusage); }
-115	AUE_SWAPOFF	MSTD	{ int linux_swapoff(void); }
-116	AUE_NULL	MSTD	{ int linux_sysinfo(struct l_sysinfo *info); }
-117	AUE_NULL	MSTD	{ int linux_ipc(l_uint what, l_int arg1, \
+115	AUE_SWAPOFF	STD	{ int linux_swapoff(void); }
+116	AUE_NULL	STD	{ int linux_sysinfo(struct l_sysinfo *info); }
+117	AUE_NULL	STD	{ int linux_ipc(l_uint what, l_int arg1, \
 				    l_int arg2, l_int arg3, void *ptr, \
 				    l_long arg5); }
-118	AUE_FSYNC	MNOPROTO	{ int fsync(int fd); }
-119	AUE_SIGRETURN	MSTD	{ int linux_sigreturn( \
+118	AUE_FSYNC	NOPROTO	{ int fsync(int fd); }
+119	AUE_SIGRETURN	STD	{ int linux_sigreturn( \
 				    struct l_sigframe *sfp); }
-120	AUE_RFORK	MSTD	{ int linux_clone(l_int flags, void *stack); }
-121	AUE_SYSCTL	MNOPROTO { int setdomainname(char *name, \
+120	AUE_RFORK	STD	{ int linux_clone(l_int flags, void *stack); }
+121	AUE_SYSCTL	NOPROTO	{ int setdomainname(char *name, \
 				    int len); }
-122	AUE_NULL	MSTD	{ int linux_newuname( \
+122	AUE_NULL	STD	{ int linux_newuname( \
 				    struct l_new_utsname *buf); }
-123	AUE_NULL	MSTD	{ int linux_modify_ldt(l_int func, \
+123	AUE_NULL	STD	{ int linux_modify_ldt(l_int func, \
 				    void *ptr, l_ulong bytecount); }
-124	AUE_ADJTIME	MSTD	{ int linux_adjtimex(void); }
-125	AUE_MPROTECT	MNOPROTO	{ int mprotect(caddr_t addr, int len, \
+124	AUE_ADJTIME	STD	{ int linux_adjtimex(void); }
+125	AUE_MPROTECT	NOPROTO	{ int mprotect(caddr_t addr, int len, \
 				    int prot); }
-126	AUE_SIGPROCMASK	MSTD	{ int linux_sigprocmask(l_int how, \
+126	AUE_SIGPROCMASK	STD	{ int linux_sigprocmask(l_int how, \
 				    l_osigset_t *mask, l_osigset_t *omask); }
-127	AUE_NULL	MSTD	{ int linux_create_module(void); }
-128	AUE_NULL	MSTD	{ int linux_init_module(void); }
-129	AUE_NULL	MSTD	{ int linux_delete_module(void); }
-130	AUE_NULL	MSTD	{ int linux_get_kernel_syms(void); }
-131	AUE_QUOTACTL	MSTD	{ int linux_quotactl(void); }
-132	AUE_GETPGID	MNOPROTO	{ int getpgid(int pid); }
-133	AUE_FCHDIR	MNOPROTO	{ int fchdir(int fd); }
-134	AUE_BDFLUSH	MSTD	{ int linux_bdflush(void); }
-135	AUE_NULL	MSTD	{ int linux_sysfs(l_int option, \
+127	AUE_NULL	STD	{ int linux_create_module(void); }
+128	AUE_NULL	STD	{ int linux_init_module(void); }
+129	AUE_NULL	STD	{ int linux_delete_module(void); }
+130	AUE_NULL	STD	{ int linux_get_kernel_syms(void); }
+131	AUE_QUOTACTL	STD	{ int linux_quotactl(void); }
+132	AUE_GETPGID	NOPROTO	{ int getpgid(int pid); }
+133	AUE_FCHDIR	NOPROTO	{ int fchdir(int fd); }
+134	AUE_BDFLUSH	STD	{ int linux_bdflush(void); }
+135	AUE_NULL	STD	{ int linux_sysfs(l_int option, \
 				    l_ulong arg1, l_ulong arg2); }
-136	AUE_PERSONALITY	MSTD	{ int linux_personality(l_ulong per); }
+136	AUE_PERSONALITY	STD	{ int linux_personality(l_ulong per); }
 137	AUE_NULL	UNIMPL	afs_syscall
-138	AUE_SETFSUID	MSTD	{ int linux_setfsuid16(l_uid16_t uid); }
-139	AUE_SETFSGID	MSTD	{ int linux_setfsgid16(l_gid16_t gid); }
-140	AUE_LSEEK	MSTD	{ int linux_llseek(l_int fd, l_ulong ohigh, \
+138	AUE_SETFSUID	STD	{ int linux_setfsuid16(l_uid16_t uid); }
+139	AUE_SETFSGID	STD	{ int linux_setfsgid16(l_gid16_t gid); }
+140	AUE_LSEEK	STD	{ int linux_llseek(l_int fd, l_ulong ohigh, \
 				    l_ulong olow, l_loff_t *res, \
 				    l_uint whence); }
-141	AUE_O_GETDENTS	MSTD	{ int linux_getdents(l_uint fd, void *dent, \
+141	AUE_O_GETDENTS	STD	{ int linux_getdents(l_uint fd, void *dent, \
 				    l_uint count); }
-142	AUE_SELECT	MSTD	{ int linux_select(l_int nfds, \
+142	AUE_SELECT	STD	{ int linux_select(l_int nfds, \
 				    l_fd_set *readfds, l_fd_set *writefds, \
 				    l_fd_set *exceptfds, \
 				    struct l_timeval *timeout); }
-143	AUE_FLOCK	MNOPROTO	{ int flock(int fd, int how); }
-144	AUE_MSYNC	MSTD	{ int linux_msync(l_ulong addr, \
+143	AUE_FLOCK	NOPROTO	{ int flock(int fd, int how); }
+144	AUE_MSYNC	STD	{ int linux_msync(l_ulong addr, \
 				    l_size_t len, l_int fl); }
-145	AUE_READV	MNOPROTO	{ int readv(int fd, struct iovec *iovp, \
+145	AUE_READV	NOPROTO	{ int readv(int fd, struct iovec *iovp, \
 				    u_int iovcnt); }
-146	AUE_WRITEV	MNOPROTO	{ int writev(int fd, struct iovec *iovp, \
+146	AUE_WRITEV	NOPROTO	{ int writev(int fd, struct iovec *iovp, \
 				    u_int iovcnt); }
-147	AUE_GETSID	MSTD	{ int linux_getsid(l_pid_t pid); }
-148	AUE_NULL	MSTD	{ int linux_fdatasync(l_uint fd); }
-149	AUE_SYSCTL	MSTD	{ int linux_sysctl( \
+147	AUE_GETSID	STD	{ int linux_getsid(l_pid_t pid); }
+148	AUE_NULL	STD	{ int linux_fdatasync(l_uint fd); }
+149	AUE_SYSCTL	STD	{ int linux_sysctl( \
 				    struct l___sysctl_args *args); }
-150	AUE_MLOCK	MNOPROTO { int mlock(const void *addr, size_t len); }
-151	AUE_MUNLOCK	MNOPROTO { int munlock(const void *addr, size_t len); }
-152	AUE_MLOCKALL	MNOPROTO { int mlockall(int how); }
-153	AUE_MUNLOCKALL	MNOPROTO { int munlockall(void); }
-154	AUE_SCHED_SETPARAM	MNOPROTO { int sched_setparam(pid_t pid, \
+150	AUE_MLOCK	NOPROTO	{ int mlock(const void *addr, size_t len); }
+151	AUE_MUNLOCK	NOPROTO	{ int munlock(const void *addr, size_t len); }
+152	AUE_MLOCKALL	NOPROTO	{ int mlockall(int how); }
+153	AUE_MUNLOCKALL	NOPROTO	{ int munlockall(void); }
+154	AUE_SCHED_SETPARAM	NOPROTO	{ int sched_setparam(pid_t pid, \
 				    const struct sched_param *param); }
-155	AUE_SCHED_GETPARAM	MNOPROTO { int sched_getparam(pid_t pid, \
+155	AUE_SCHED_GETPARAM	NOPROTO	{ int sched_getparam(pid_t pid, \
 				    struct sched_param *param); }
-156	AUE_SCHED_SETSCHEDULER	MSTD	{ int linux_sched_setscheduler(l_pid_t pid, \
+156	AUE_SCHED_SETSCHEDULER	STD	{ int linux_sched_setscheduler(l_pid_t pid, \
 				    l_int policy, \
 				    struct l_sched_param *param); }
-157	AUE_SCHED_GETSCHEDULER	MSTD	{ int linux_sched_getscheduler(l_pid_t pid); }
-158	AUE_NULL	MNOPROTO	{ int sched_yield(void); }
-159	AUE_SCHED_GET_PRIORITY_MAX	MSTD	{ int linux_sched_get_priority_max( \
+157	AUE_SCHED_GETSCHEDULER	STD	{ int linux_sched_getscheduler(l_pid_t pid); }
+158	AUE_NULL	NOPROTO	{ int sched_yield(void); }
+159	AUE_SCHED_GET_PRIORITY_MAX	STD	{ int linux_sched_get_priority_max( \
 				    l_int policy); }
-160	AUE_SCHED_GET_PRIORITY_MIN	MSTD	{ int linux_sched_get_priority_min( \
+160	AUE_SCHED_GET_PRIORITY_MIN	STD	{ int linux_sched_get_priority_min( \
 				    l_int policy); }
-161	AUE_SCHED_RR_GET_INTERVAL	MNOPROTO { int sched_rr_get_interval(l_pid_t pid, \
+161	AUE_SCHED_RR_GET_INTERVAL	NOPROTO	{ int sched_rr_get_interval(l_pid_t pid, \
 				    struct l_timespec *interval); }
-162	AUE_NULL	MNOPROTO { int nanosleep( \
+162	AUE_NULL	NOPROTO	{ int nanosleep( \
 				    const struct timespec *rqtp, \
 				    struct timespec *rmtp); }
-163	AUE_NULL	MSTD	{ int linux_mremap(l_ulong addr, \
+163	AUE_NULL	STD	{ int linux_mremap(l_ulong addr, \
 				    l_ulong old_len, l_ulong new_len, \
 				    l_ulong flags, l_ulong new_addr); }
-164	AUE_SETRESUID	MSTD	{ int linux_setresuid16(l_uid16_t ruid, \
+164	AUE_SETRESUID	STD	{ int linux_setresuid16(l_uid16_t ruid, \
 				    l_uid16_t euid, l_uid16_t suid); }
-165	AUE_GETRESUID	MSTD	{ int linux_getresuid16(l_uid16_t *ruid, \
+165	AUE_GETRESUID	STD	{ int linux_getresuid16(l_uid16_t *ruid, \
 				    l_uid16_t *euid, l_uid16_t *suid); }
-166	AUE_NULL	MSTD	{ int linux_vm86(void); }
-167	AUE_NULL	MSTD	{ int linux_query_module(void); }
-168	AUE_POLL	MNOPROTO	{ int poll(struct pollfd*, \
+166	AUE_NULL	STD	{ int linux_vm86(void); }
+167	AUE_NULL	STD	{ int linux_query_module(void); }
+168	AUE_POLL	NOPROTO	{ int poll(struct pollfd*, \
 				    unsigned int nfds, long timeout); }
-169	AUE_NULL	MSTD	{ int linux_nfsservctl(void); }
-170	AUE_SETRESGID	MSTD	{ int linux_setresgid16(l_gid16_t rgid, \
+169	AUE_NULL	STD	{ int linux_nfsservctl(void); }
+170	AUE_SETRESGID	STD	{ int linux_setresgid16(l_gid16_t rgid, \
 				    l_gid16_t egid, l_gid16_t sgid); }
-171	AUE_GETRESGID	MSTD	{ int linux_getresgid16(l_gid16_t *rgid, \
+171	AUE_GETRESGID	STD	{ int linux_getresgid16(l_gid16_t *rgid, \
 				    l_gid16_t *egid, l_gid16_t *sgid); }
-172	AUE_PRCTL	MSTD	{ int linux_prctl(void); }
-173	AUE_NULL	MSTD	{ int linux_rt_sigreturn( \
+172	AUE_PRCTL	STD	{ int linux_prctl(void); }
+173	AUE_NULL	STD	{ int linux_rt_sigreturn( \
 				    struct l_ucontext *ucp); }
-174	AUE_NULL	MSTD	{ int linux_rt_sigaction(l_int sig, \
+174	AUE_NULL	STD	{ int linux_rt_sigaction(l_int sig, \
 				    l_sigaction_t *act, l_sigaction_t *oact, \
 				    l_size_t sigsetsize); }
-175	AUE_NULL	MSTD	{ int linux_rt_sigprocmask(l_int how, \
+175	AUE_NULL	STD	{ int linux_rt_sigprocmask(l_int how, \
 				    l_sigset_t *mask, l_sigset_t *omask, \
 				    l_size_t sigsetsize); }
-176	AUE_NULL	MSTD	{ int linux_rt_sigpending(l_sigset_t *set, \
+176	AUE_NULL	STD	{ int linux_rt_sigpending(l_sigset_t *set, \
 				    l_size_t sigsetsize); }
-177	AUE_NULL	MSTD	{ int linux_rt_sigtimedwait(void); }
-178	AUE_NULL	MSTD	{ int linux_rt_sigqueueinfo(void); }
-179	AUE_NULL	MSTD	{ int linux_rt_sigsuspend( \
+177	AUE_NULL	STD	{ int linux_rt_sigtimedwait(void); }
+178	AUE_NULL	STD	{ int linux_rt_sigqueueinfo(void); }
+179	AUE_NULL	STD	{ int linux_rt_sigsuspend( \
 				    l_sigset_t *newset, \
 				    l_size_t sigsetsize); }
-180	AUE_PREAD	MSTD	{ int linux_pread(l_uint fd, char *buf, \
+180	AUE_PREAD	STD	{ int linux_pread(l_uint fd, char *buf, \
 				    l_size_t nbyte, l_loff_t offset); }
-181	AUE_PWRITE	MSTD	{ int linux_pwrite(l_uint fd, char *buf, \
+181	AUE_PWRITE	STD	{ int linux_pwrite(l_uint fd, char *buf, \
 				    l_size_t nbyte, l_loff_t offset); }
-182	AUE_CHOWN	MSTD	{ int linux_chown16(char *path, \
+182	AUE_CHOWN	STD	{ int linux_chown16(char *path, \
 				    l_uid16_t uid, l_gid16_t gid); }
-183	AUE_GETCWD	MSTD	{ int linux_getcwd(char *buf, \
+183	AUE_GETCWD	STD	{ int linux_getcwd(char *buf, \
 				    l_ulong bufsize); }
-184	AUE_CAPGET	MSTD	{ int linux_capget(void); }
-185	AUE_CAPSET	MSTD	{ int linux_capset(void); }
-186	AUE_NULL	MSTD	{ int linux_sigaltstack(l_stack_t *uss, \
+184	AUE_CAPGET	STD	{ int linux_capget(void); }
+185	AUE_CAPSET	STD	{ int linux_capset(void); }
+186	AUE_NULL	STD	{ int linux_sigaltstack(l_stack_t *uss, \
 				    l_stack_t *uoss); }
-187	AUE_SENDFILE	MSTD	{ int linux_sendfile(void); }
+187	AUE_SENDFILE	STD	{ int linux_sendfile(void); }
 188	AUE_GETPMSG	UNIMPL	getpmsg
 189	AUE_PUTPMSG	UNIMPL	putpmsg
-190	AUE_VFORK	MSTD	{ int linux_vfork(void); }
-191	AUE_GETRLIMIT	MSTD	{ int linux_getrlimit(l_uint resource, \
+190	AUE_VFORK	STD	{ int linux_vfork(void); }
+191	AUE_GETRLIMIT	STD	{ int linux_getrlimit(l_uint resource, \
 				    struct l_rlimit *rlim); }
-192	AUE_MMAP	MSTD	{ int linux_mmap2(l_ulong addr, l_ulong len, \
+192	AUE_MMAP	STD	{ int linux_mmap2(l_ulong addr, l_ulong len, \
 				    l_ulong prot, l_ulong flags, l_ulong fd, \
 				    l_ulong pgoff); }
-193	AUE_TRUNCATE	MSTD	{ int linux_truncate64(char *path, \
+193	AUE_TRUNCATE	STD	{ int linux_truncate64(char *path, \
 				    l_loff_t length); }
-194	AUE_FTRUNCATE	MSTD	{ int linux_ftruncate64(l_uint fd, \
+194	AUE_FTRUNCATE	STD	{ int linux_ftruncate64(l_uint fd, \
 				    l_loff_t length); }
-195	AUE_STAT	MSTD	{ int linux_stat64(char *filename, \
+195	AUE_STAT	STD	{ int linux_stat64(char *filename, \
 				    struct l_stat64 *statbuf, l_long flags); }
-196	AUE_LSTAT	MSTD	{ int linux_lstat64(char *filename, \
+196	AUE_LSTAT	STD	{ int linux_lstat64(char *filename, \
 				    struct l_stat64 *statbuf, l_long flags); }
-197	AUE_FSTAT	MSTD	{ int linux_fstat64(l_ulong fd, \
+197	AUE_FSTAT	STD	{ int linux_fstat64(l_ulong fd, \
 				    struct l_stat64 *statbuf, l_long flags); }
-198	AUE_LCHOWN	MSTD	{ int linux_lchown(char *path, l_uid_t uid, \
+198	AUE_LCHOWN	STD	{ int linux_lchown(char *path, l_uid_t uid, \
 				    l_gid_t gid); }
-199	AUE_GETUID	MSTD	{ int linux_getuid(void); }
-200	AUE_GETGID	MSTD	{ int linux_getgid(void); }
-201	AUE_GETEUID	MNOPROTO { int geteuid(void); }
-202	AUE_GETEGID	MNOPROTO { int getegid(void); }
-203	AUE_SETREUID	MNOPROTO { int setreuid(uid_t ruid, uid_t euid); }
-204	AUE_SETREGID	MNOPROTO { int setregid(gid_t rgid, gid_t egid); }
-205	AUE_GETGROUPS	MSTD	{ int linux_getgroups(l_int gidsetsize, \
+199	AUE_GETUID	STD	{ int linux_getuid(void); }
+200	AUE_GETGID	STD	{ int linux_getgid(void); }
+201	AUE_GETEUID	NOPROTO	{ int geteuid(void); }
+202	AUE_GETEGID	NOPROTO	{ int getegid(void); }
+203	AUE_SETREUID	NOPROTO	{ int setreuid(uid_t ruid, uid_t euid); }
+204	AUE_SETREGID	NOPROTO	{ int setregid(gid_t rgid, gid_t egid); }
+205	AUE_GETGROUPS	STD	{ int linux_getgroups(l_int gidsetsize, \
 				    l_gid_t *grouplist); }
-206	AUE_SETGROUPS	MSTD	{ int linux_setgroups(l_int gidsetsize, \
+206	AUE_SETGROUPS	STD	{ int linux_setgroups(l_int gidsetsize, \
 				    l_gid_t *grouplist); }
 207	AUE_FCHOWN	NODEF	fchown fchown fchown_args int
-208	AUE_SETRESUID	MNOPROTO { int setresuid(uid_t ruid, uid_t euid, \
+208	AUE_SETRESUID	NOPROTO	{ int setresuid(uid_t ruid, uid_t euid, \
 				    uid_t suid); }
-209	AUE_GETRESUID	MNOPROTO { int getresuid(uid_t *ruid, uid_t *euid, \
+209	AUE_GETRESUID	NOPROTO	{ int getresuid(uid_t *ruid, uid_t *euid, \
 				    uid_t *suid); }
-210	AUE_SETRESGID	MNOPROTO { int setresgid(gid_t rgid, gid_t egid, \
+210	AUE_SETRESGID	NOPROTO	{ int setresgid(gid_t rgid, gid_t egid, \
 				    gid_t sgid); }
-211	AUE_GETRESGID	MNOPROTO { int getresgid(gid_t *rgid, gid_t *egid, \
+211	AUE_GETRESGID	NOPROTO	{ int getresgid(gid_t *rgid, gid_t *egid, \
 				    gid_t *sgid); }
-212	AUE_CHOWN	MSTD	{ int linux_chown(char *path, l_uid_t uid, \
+212	AUE_CHOWN	STD	{ int linux_chown(char *path, l_uid_t uid, \
 				    l_gid_t gid); }
-213	AUE_SETUID	MNOPROTO { int setuid(uid_t uid); }
-214	AUE_SETGID	MNOPROTO { int setgid(gid_t gid); }
-215	AUE_SETFSUID	MSTD	{ int linux_setfsuid(l_uid_t uid); }
-216	AUE_SETFSGID	MSTD	{ int linux_setfsgid(l_gid_t gid); }
-217	AUE_PIVOT_ROOT	MSTD	{ int linux_pivot_root(char *new_root, \
+213	AUE_SETUID	NOPROTO	{ int setuid(uid_t uid); }
+214	AUE_SETGID	NOPROTO	{ int setgid(gid_t gid); }
+215	AUE_SETFSUID	STD	{ int linux_setfsuid(l_uid_t uid); }
+216	AUE_SETFSGID	STD	{ int linux_setfsgid(l_gid_t gid); }
+217	AUE_PIVOT_ROOT	STD	{ int linux_pivot_root(char *new_root, \
 				    char *put_old); }
-218	AUE_MINCORE	MSTD	{ int linux_mincore(l_ulong start, \
+218	AUE_MINCORE	STD	{ int linux_mincore(l_ulong start, \
 				    l_size_t len, u_char *vec); }
-219	AUE_MADVISE	MNOPROTO { int madvise(void *addr, size_t len, \
+219	AUE_MADVISE	NOPROTO	{ int madvise(void *addr, size_t len, \
 				    int behav); }
-220	AUE_O_GETDENTS	MSTD	{ int linux_getdents64(l_uint fd, \
+220	AUE_O_GETDENTS	STD	{ int linux_getdents64(l_uint fd, \
 				    void *dirent, l_uint count); }
-221	AUE_FCNTL	MSTD	{ int linux_fcntl64(l_uint fd, l_uint cmd, \
+221	AUE_FCNTL	STD	{ int linux_fcntl64(l_uint fd, l_uint cmd, \
 				    l_ulong arg); }
 222	AUE_NULL	UNIMPL
 223	AUE_NULL	UNIMPL
-224	AUE_NULL	MSTD	{ long linux_gettid(void); }
+224	AUE_NULL	STD	{ long linux_gettid(void); }
 225	AUE_NULL	UNIMPL	linux_readahead
-226	AUE_NULL	MSTD	{ int linux_setxattr(void); }
-227	AUE_NULL	MSTD	{ int linux_lsetxattr(void); }
-228	AUE_NULL	MSTD	{ int linux_fsetxattr(void); }
-229	AUE_NULL	MSTD	{ int linux_getxattr(void); }
-230	AUE_NULL	MSTD	{ int linux_lgetxattr(void); }
-231	AUE_NULL	MSTD	{ int linux_fgetxattr(void); }
-232	AUE_NULL	MSTD	{ int linux_listxattr(void); }
-233	AUE_NULL	MSTD	{ int linux_llistxattr(void); }
-234	AUE_NULL	MSTD	{ int linux_flistxattr(void); }
-235	AUE_NULL	MSTD	{ int linux_removexattr(void); }
-236	AUE_NULL	MSTD	{ int linux_lremovexattr(void); }
-237	AUE_NULL	MSTD	{ int linux_fremovexattr(void); }
-238	AUE_NULL	MSTD	{ int linux_tkill(int tid, int sig); }
+226	AUE_NULL	STD	{ int linux_setxattr(void); }
+227	AUE_NULL	STD	{ int linux_lsetxattr(void); }
+228	AUE_NULL	STD	{ int linux_fsetxattr(void); }
+229	AUE_NULL	STD	{ int linux_getxattr(void); }
+230	AUE_NULL	STD	{ int linux_lgetxattr(void); }
+231	AUE_NULL	STD	{ int linux_fgetxattr(void); }
+232	AUE_NULL	STD	{ int linux_listxattr(void); }
+233	AUE_NULL	STD	{ int linux_llistxattr(void); }
+234	AUE_NULL	STD	{ int linux_flistxattr(void); }
+235	AUE_NULL	STD	{ int linux_removexattr(void); }
+236	AUE_NULL	STD	{ int linux_lremovexattr(void); }
+237	AUE_NULL	STD	{ int linux_fremovexattr(void); }
+238	AUE_NULL	STD	{ int linux_tkill(int tid, int sig); }
 239	AUE_SENDFILE	UNIMPL	linux_sendfile64
 240	AUE_NULL	UNIMPL	linux_futex
 241	AUE_NULL	UNIMPL	linux_sched_setaffinity
 242	AUE_NULL	UNIMPL	linux_sched_getaffinity
-243	AUE_NULL	MSTD	{ int linux_set_thread_area(void *entry); }
+243	AUE_NULL	STD	{ int linux_set_thread_area(void *entry); }
 244	AUE_NULL	UNIMPL	linux_get_thread_area
 245	AUE_NULL	UNIMPL	linux_io_setup
 246	AUE_NULL	UNIMPL	linux_io_destroy
 247	AUE_NULL	UNIMPL	linux_io_getevents
 248	AUE_NULL	UNIMPL	linux_io_submit
 249	AUE_NULL	UNIMPL	linux_io_cancel
-250	AUE_NULL	MSTD	{ int linux_fadvise64(void); }
+250	AUE_NULL	STD	{ int linux_fadvise64(void); }
 251	AUE_NULL	UNIMPL
-252	AUE_EXIT	MNOPROTO { void sys_exit(int rval); } exit_group \
+252	AUE_EXIT	NOPROTO	{ void sys_exit(int rval); } exit_group \
 				    sys_exit_args void
-253	AUE_NULL	MSTD	{ int linux_lookup_dcookie(void); }
-254	AUE_NULL	MSTD	{ int linux_epoll_create(void); }
-255	AUE_NULL	MSTD	{ int linux_epoll_ctl(void); }
-256	AUE_NULL	MSTD	{ int linux_epoll_wait(void); }
-257	AUE_NULL	MSTD	{ int linux_remap_file_pages(void); }
-258	AUE_NULL	MSTD	{ int linux_set_tid_address(void); }
-259	AUE_NULL	MSTD	{ int linux_timer_create(void); }
-260	AUE_NULL	MSTD	{ int linux_timer_settime(void); }
-261	AUE_NULL	MSTD	{ int linux_timer_gettime(void); }
-262	AUE_NULL	MSTD	{ int linux_timer_getoverrun(void); }
-263	AUE_NULL	MSTD	{ int linux_timer_delete(void); }
-264	AUE_CLOCK_SETTIME	MSTD	{ int linux_clock_settime(void); }
-265	AUE_NULL	MSTD	{ int linux_clock_gettime(void); }
-266	AUE_NULL	MSTD	{ int linux_clock_getres(void); }
-267	AUE_NULL	MSTD	{ int linux_clock_nanosleep(void); }
-268	AUE_NULL	MSTD	{ int linux_statfs64(void); }
-269	AUE_NULL	MSTD	{ int linux_fstatfs64(void); }
-270	AUE_NULL	MSTD	{ int linux_tgkill(void); }
-271	AUE_NULL	MSTD	{ int linux_utimes(void); }
-272	AUE_NULL	MSTD	{ int linux_fadvise64_64(void); }
+253	AUE_NULL	STD	{ int linux_lookup_dcookie(void); }
+254	AUE_NULL	STD	{ int linux_epoll_create(void); }
+255	AUE_NULL	STD	{ int linux_epoll_ctl(void); }
+256	AUE_NULL	STD	{ int linux_epoll_wait(void); }
+257	AUE_NULL	STD	{ int linux_remap_file_pages(void); }
+258	AUE_NULL	STD	{ int linux_set_tid_address(void); }
+259	AUE_NULL	STD	{ int linux_timer_create(void); }
+260	AUE_NULL	STD	{ int linux_timer_settime(void); }
+261	AUE_NULL	STD	{ int linux_timer_gettime(void); }
+262	AUE_NULL	STD	{ int linux_timer_getoverrun(void); }
+263	AUE_NULL	STD	{ int linux_timer_delete(void); }
+264	AUE_CLOCK_SETTIME	STD	{ int linux_clock_settime(void); }
+265	AUE_NULL	STD	{ int linux_clock_gettime(void); }
+266	AUE_NULL	STD	{ int linux_clock_getres(void); }
+267	AUE_NULL	STD	{ int linux_clock_nanosleep(void); }
+268	AUE_NULL	STD	{ int linux_statfs64(void); }
+269	AUE_NULL	STD	{ int linux_fstatfs64(void); }
+270	AUE_NULL	STD	{ int linux_tgkill(void); }
+271	AUE_NULL	STD	{ int linux_utimes(void); }
+272	AUE_NULL	STD	{ int linux_fadvise64_64(void); }
 273	AUE_NULL	UNIMPL
-274	AUE_NULL	MSTD	{ int linux_mbind(void); }
-275	AUE_NULL	MSTD	{ int linux_get_mempolicy(void); }
-276	AUE_NULL	MSTD	{ int linux_set_mempolicy(void); }
-277	AUE_NULL	MSTD	{ int linux_mq_open(void); }
-278	AUE_NULL	MSTD	{ int linux_mq_unlink(void); }
-279	AUE_NULL	MSTD	{ int linux_mq_timedsend(void); }
-280	AUE_NULL	MSTD	{ int linux_mq_timedreceive(void); }
-281	AUE_NULL	MSTD	{ int linux_mq_notify(void); }
-282	AUE_NULL	MSTD	{ int linux_mq_getsetattr(void); }
-283	AUE_NULL	MSTD	{ int linux_kexec_load(void); }
-284	AUE_NULL	MSTD	{ int linux_waitid(void); }
+274	AUE_NULL	STD	{ int linux_mbind(void); }
+275	AUE_NULL	STD	{ int linux_get_mempolicy(void); }
+276	AUE_NULL	STD	{ int linux_set_mempolicy(void); }
+277	AUE_NULL	STD	{ int linux_mq_open(void); }
+278	AUE_NULL	STD	{ int linux_mq_unlink(void); }
+279	AUE_NULL	STD	{ int linux_mq_timedsend(void); }
+280	AUE_NULL	STD	{ int linux_mq_timedreceive(void); }
+281	AUE_NULL	STD	{ int linux_mq_notify(void); }
+282	AUE_NULL	STD	{ int linux_mq_getsetattr(void); }
+283	AUE_NULL	STD	{ int linux_kexec_load(void); }
+284	AUE_NULL	STD	{ int linux_waitid(void); }
 285	AUE_NULL	UNIMPL
-286	AUE_NULL	MSTD	{ int linux_add_key(void); }
-287	AUE_NULL	MSTD	{ int linux_request_key(void); }
-288	AUE_NULL	MSTD	{ int linux_keyctl(void); }
-289	AUE_NULL	MSTD	{ int linux_ioprio_set(void); }
-290	AUE_NULL	MSTD	{ int linux_ioprio_get(void); }
-291	AUE_NULL	MSTD	{ int linux_inotify_init(void); }
-292	AUE_NULL	MSTD	{ int linux_inotify_add_watch(void); }
-293	AUE_NULL	MSTD	{ int linux_inotify_rm_watch(void); }
-294	AUE_NULL	MSTD	{ int linux_migrate_pages(void); }
-295	AUE_NULL	MSTD	{ int linux_openat(void); }
-296	AUE_NULL	MSTD	{ int linux_mkdirat(void); }
-297	AUE_NULL	MSTD	{ int linux_mknodat(void); }
-298	AUE_NULL	MSTD	{ int linux_fchownat(void); }
-299	AUE_NULL	MSTD	{ int linux_futimesat(void); }
-300	AUE_NULL	MSTD	{ int linux_fstatat64(void); }
-301	AUE_NULL	MSTD	{ int linux_unlinkat(void); }
-302	AUE_NULL	MSTD	{ int linux_renameat(void); }
-303	AUE_NULL	MSTD	{ int linux_linkat(void); }
-304	AUE_NULL	MSTD	{ int linux_symlinkat(void); }
-305	AUE_NULL	MSTD	{ int linux_readlinkat(void); }
-306	AUE_NULL	MSTD	{ int linux_fchmodat(void); }
-307	AUE_NULL	MSTD	{ int linux_faccessat(void); }
-308	AUE_NULL	MSTD	{ int linux_pselect6(void); }
-309	AUE_NULL	MSTD	{ int linux_ppoll(void); }
-310	AUE_NULL	MSTD	{ int linux_unshare(void); }
+286	AUE_NULL	STD	{ int linux_add_key(void); }
+287	AUE_NULL	STD	{ int linux_request_key(void); }
+288	AUE_NULL	STD	{ int linux_keyctl(void); }
+289	AUE_NULL	STD	{ int linux_ioprio_set(void); }
+290	AUE_NULL	STD	{ int linux_ioprio_get(void); }
+291	AUE_NULL	STD	{ int linux_inotify_init(void); }
+292	AUE_NULL	STD	{ int linux_inotify_add_watch(void); }
+293	AUE_NULL	STD	{ int linux_inotify_rm_watch(void); }
+294	AUE_NULL	STD	{ int linux_migrate_pages(void); }
+295	AUE_NULL	STD	{ int linux_openat(void); }
+296	AUE_NULL	STD	{ int linux_mkdirat(void); }
+297	AUE_NULL	STD	{ int linux_mknodat(void); }
+298	AUE_NULL	STD	{ int linux_fchownat(void); }
+299	AUE_NULL	STD	{ int linux_futimesat(void); }
+300	AUE_NULL	STD	{ int linux_fstatat64(void); }
+301	AUE_NULL	STD	{ int linux_unlinkat(void); }
+302	AUE_NULL	STD	{ int linux_renameat(void); }
+303	AUE_NULL	STD	{ int linux_linkat(void); }
+304	AUE_NULL	STD	{ int linux_symlinkat(void); }
+305	AUE_NULL	STD	{ int linux_readlinkat(void); }
+306	AUE_NULL	STD	{ int linux_fchmodat(void); }
+307	AUE_NULL	STD	{ int linux_faccessat(void); }
+308	AUE_NULL	STD	{ int linux_pselect6(void); }
+309	AUE_NULL	STD	{ int linux_ppoll(void); }
+310	AUE_NULL	STD	{ int linux_unshare(void); }