The following compat syscalls are now mpsafe: linux_getrlimit(),

linux_setrlimit(), linux_old_getrlimit(), osf1_getrlimit(),
osf1_setrlimit(), svr4_sys_ulimit(), svr4_sys_setrlimit(),
svr4_sys_getrlimit(), svr4_sys_setrlimit64(), svr4_sys_getrlimit64(),
ibcs2_sysconf(), and ibcs2_ulimit().

7 files changed, 15 insertions, 15 deletions

diff --git a/sys/alpha/linux/syscalls.master b/sys/alpha/linux/syscalls.master
index e066ba5cf3e3..52f0ec889337 100644
--- a/sys/alpha/linux/syscalls.master
+++ b/sys/alpha/linux/syscalls.master
@@ -194,9 +194,9 @@
 141	NOPROTO	{ int ogetpeername(int fdes, caddr_t asa, int *alen); }
 142	UNIMPL
 143	UNIMPL
-144	STD	{ int linux_getrlimit(l_uint resource, \
+144	MSTD	{ int linux_getrlimit(l_uint resource, \
 				struct l_rlimit *rlim); }
-145	STD	{ int linux_setrlimit(l_uint resource, \
+145	MSTD	{ int linux_setrlimit(l_uint resource, \
 				struct l_rlimit *rlim); }
 146	UNIMPL
 147	MNOPROTO { int setsid(void); }
diff --git a/sys/alpha/osf1/syscalls.master b/sys/alpha/osf1/syscalls.master
index 3b662385ef05..e0aa73fa8cae 100644
--- a/sys/alpha/osf1/syscalls.master
+++ b/sys/alpha/osf1/syscalls.master
@@ -199,8 +199,8 @@
 141	NOPROTO	{ int ogetpeername(int fdes, caddr_t asa, int *alen); }
 142	MNOPROTO { int32_t ogethostid(void); }
 143	MNOPROTO { int osethostid(int32_t hostid); }
-144	STD	{ int osf1_getrlimit(u_int which, struct rlimit *rlp); }
-145	STD	{ int osf1_setrlimit(u_int which, struct rlimit *rlp); }
+144	MSTD	{ int osf1_getrlimit(u_int which, struct rlimit *rlp); }
+145	MSTD	{ int osf1_setrlimit(u_int which, struct rlimit *rlp); }
 146	UNIMPL	old killpg
 147	MNOPROTO { int setsid(void); }
 148	UNIMPL	quotactl
diff --git a/sys/compat/svr4/syscalls.master b/sys/compat/svr4/syscalls.master
index af96bef35df0..1de9d7730035 100644
--- a/sys/compat/svr4/syscalls.master
+++ b/sys/compat/svr4/syscalls.master
@@ -101,7 +101,7 @@
 60	NOPROTO	{ int umask(int newmask); }
 61	NOPROTO	{ int chroot(char *path); }
 62	STD	{ int svr4_sys_fcntl(int fd, int cmd, char *arg); }
-63	STD	{ int svr4_sys_ulimit(int cmd, long newlimit); }
+63	MSTD	{ int svr4_sys_ulimit(int cmd, long newlimit); }
 64	UNIMPL	reserved
 65	UNIMPL	reserved
 66	UNIMPL	reserved
@@ -178,9 +178,9 @@
 126	STD	{ int svr4_sys_xmknod(int two, char *path, svr4_mode_t mode, \
 		    svr4_dev_t dev); }
 127	UNIMPL	clocal
-128	STD	{ int svr4_sys_setrlimit(int which, \
+128	MSTD	{ int svr4_sys_setrlimit(int which, \
 		    const struct svr4_rlimit *rlp); }
-129	STD	{ int svr4_sys_getrlimit(int which, \
+129	MSTD	{ int svr4_sys_getrlimit(int which, \
 		    struct svr4_rlimit *rlp); }
 130	NOPROTO	{ int lchown(char *path, uid_t uid, gid_t gid); }
 131	STD	{ int svr4_sys_memcntl(void * addr, svr4_size_t len, int cmd, \
@@ -288,9 +288,9 @@
 218	STD	{ int svr4_sys_statvfs64(char *path, \
 		    struct svr4_statvfs64 *fs); }
 219	STD	{ int svr4_sys_fstatvfs64(int fd, struct svr4_statvfs64 *fs); }
-220	STD	{ int svr4_sys_setrlimit64(int which, \
+220	MSTD	{ int svr4_sys_setrlimit64(int which, \
 		    const struct svr4_rlimit64 *rlp); }
-221	STD	{ int svr4_sys_getrlimit64(int which, \
+221	MSTD	{ int svr4_sys_getrlimit64(int which, \
 		    struct svr4_rlimit64 *rlp); }
 222	UNIMPL	pread64
 223	UNIMPL	pwrite64
diff --git a/sys/i386/ibcs2/syscalls.isc b/sys/i386/ibcs2/syscalls.isc
index 598702969065..22ab06a100ca 100644
--- a/sys/i386/ibcs2/syscalls.isc
+++ b/sys/i386/ibcs2/syscalls.isc
@@ -26,7 +26,7 @@
 13	NOPROTO	{ pid_t getpid(void); }
 14	UNIMPL	isc_adduser
 15	UNIMPL	isc_setuser
-16	NOPROTO	{ int ibcs2_sysconf(int name); }
+16	MNOPROTO { int ibcs2_sysconf(int name); }
 17	NOPROTO	{ int ibcs2_sigsuspend(ibcs2_sigset_t *mask); }
 18	NOPROTO	{ int ibcs2_symlink(char *path, char *link); }
 19	NOPROTO	{ int ibcs2_readlink(char *path, char *buf, int count); }
diff --git a/sys/i386/ibcs2/syscalls.master b/sys/i386/ibcs2/syscalls.master
index 195317c35bcf..f6f73be12e7c 100644
--- a/sys/i386/ibcs2/syscalls.master
+++ b/sys/i386/ibcs2/syscalls.master
@@ -99,7 +99,7 @@
 60	NOPROTO	{ int umask(int newmask); }
 61	NOPROTO	{ int chroot(char *path); }
 62	STD	{ int ibcs2_fcntl(int fd, int cmd, char *arg); }
-63	STD	{ long ibcs2_ulimit(int cmd, int newlimit); }
+63	MSTD	{ long ibcs2_ulimit(int cmd, int newlimit); }
 64	UNIMPL	reserved for unix/pc
 65	UNIMPL	reserved for unix/pc
 66	UNIMPL	reserved for unix/pc
diff --git a/sys/i386/ibcs2/syscalls.xenix b/sys/i386/ibcs2/syscalls.xenix
index e46d29599044..393d65d4b3bf 100644
--- a/sys/i386/ibcs2/syscalls.xenix
+++ b/sys/i386/ibcs2/syscalls.xenix
@@ -55,7 +55,7 @@
 42	STD	{ int ibcs2_sigsuspend(ibcs2_sigset_t *mask); }
 43	STD	{ int ibcs2_getgroups(int gidsetsize, ibcs2_gid_t *gidset); }
 44	STD	{ int ibcs2_setgroups(int gidsetsize, ibcs2_gid_t *gidset); }
-45	STD	{ int ibcs2_sysconf(int name); }
+45	MSTD	{ int ibcs2_sysconf(int name); }
 46	STD	{ int ibcs2_pathconf(char *path, int name); }
 47	STD	{ int ibcs2_fpathconf(int fd, int name); }
 48	STD	{ int ibcs2_rename(char *from, char *to); }
diff --git a/sys/i386/linux/syscalls.master b/sys/i386/linux/syscalls.master
index c322a80f6224..42377ae97d38 100644
--- a/sys/i386/linux/syscalls.master
+++ b/sys/i386/linux/syscalls.master
@@ -112,8 +112,8 @@
 73	MSTD	{ int linux_sigpending(l_osigset_t *mask); }
 74	MNOPROTO { int osethostname(char *hostname, u_int len); } \
 			    osethostname sethostname_args int
-75	STD	{ int linux_setrlimit(l_uint resource, struct l_rlimit *rlim); }
-76	STD	{ int linux_old_getrlimit(l_uint resource, \
+75	MSTD	{ int linux_setrlimit(l_uint resource, struct l_rlimit *rlim); }
+76	MSTD	{ int linux_old_getrlimit(l_uint resource, \
 				struct l_rlimit *rlim); }
 77	MNOPROTO { int getrusage(int who, struct rusage *rusage); }
 78	MNOPROTO { int gettimeofday(struct timeval *tp, struct timezone *tzp); }
@@ -258,7 +258,7 @@
 188	UNIMPL	getpmsg
 189	UNIMPL	putpmsg
 190	MSTD	{ int linux_vfork(void); }
-191	STD	{ int linux_getrlimit(l_uint resource, struct l_rlimit *rlim); }
+191	MSTD	{ int linux_getrlimit(l_uint resource, struct l_rlimit *rlim); }
 192	STD	{ int linux_mmap2(l_ulong addr, l_ulong len, \
 				l_ulong prot, l_ulong flags, l_ulong fd, \
 				l_ulong pgoff); }