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.

5 files changed, 114 insertions, 122 deletions

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); }