regen for COMPAT_2{3,5}

12 files changed, 108 insertions, 102 deletions

diff --git a/sys/compat/bsdos/bsdos_syscall.h b/sys/compat/bsdos/bsdos_syscall.h
index 17f6b1455e7..03162ab815b 100644
--- a/sys/compat/bsdos/bsdos_syscall.h
+++ b/sys/compat/bsdos/bsdos_syscall.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: bsdos_syscall.h,v 1.7 2000/05/01 23:12:28 deraadt Exp $	*/
+/*	$OpenBSD: bsdos_syscall.h,v 1.8 2001/05/16 17:17:05 millert Exp $	*/
 
 /*
  * System call numbers.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	OpenBSD: syscalls.master,v 1.7 2000/05/01 23:10:58 deraadt Exp 
+ * created from	OpenBSD: syscalls.master,v 1.8 2001/05/16 17:14:37 millert Exp 
  */
 
 /* syscall: "syscall" ret: "int" args: */
@@ -59,8 +59,8 @@
 /* syscall: "break" ret: "int" args: "char *" */
 #define	BSDOS_SYS_break	17
 
-/* syscall: "ogetfsstat" ret: "int" args: "struct ostatfs *" "long" "int" */
-#define	BSDOS_SYS_ogetfsstat	18
+/* syscall: "getfsstat" ret: "int" args: "struct ostatfs *" "long" "int" */
+#define	BSDOS_SYS_getfsstat	18
 
 /* syscall: "olseek" ret: "long" args: "int" "long" "int" */
 #define	BSDOS_SYS_olseek	19
@@ -445,11 +445,11 @@
 /* syscall: "ogetdirentries" ret: "int" args: "int" "char *" "u_int" "long *" */
 #define	BSDOS_SYS_ogetdirentries	156
 
-/* syscall: "ostatfs" ret: "int" args: "char *" "struct ostatfs *" */
-#define	BSDOS_SYS_ostatfs	157
+/* syscall: "statfs" ret: "int" args: "char *" "struct ostatfs *" */
+#define	BSDOS_SYS_statfs	157
 
-/* syscall: "ofstatfs" ret: "int" args: "int" "struct ostatfs *" */
-#define	BSDOS_SYS_ofstatfs	158
+/* syscall: "fstatfs" ret: "int" args: "int" "struct ostatfs *" */
+#define	BSDOS_SYS_fstatfs	158
 
 /* syscall: "getfh" ret: "int" args: "char *" "fhandle_t *" */
 #define	BSDOS_SYS_getfh	161
diff --git a/sys/compat/bsdos/bsdos_syscallargs.h b/sys/compat/bsdos/bsdos_syscallargs.h
index 7cc0fd17f2d..c1da2d05b7e 100644
--- a/sys/compat/bsdos/bsdos_syscallargs.h
+++ b/sys/compat/bsdos/bsdos_syscallargs.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: bsdos_syscallargs.h,v 1.7 2000/05/01 23:12:28 deraadt Exp $	*/
+/*	$OpenBSD: bsdos_syscallargs.h,v 1.8 2001/05/16 17:17:05 millert Exp $	*/
 
 /*
  * System call argument lists.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	OpenBSD: syscalls.master,v 1.7 2000/05/01 23:10:58 deraadt Exp 
+ * created from	OpenBSD: syscalls.master,v 1.8 2001/05/16 17:14:37 millert Exp 
  */
 
 #define	syscallarg(x)	union { x datum; register_t pad; }
@@ -36,7 +36,7 @@ int	sys_mknod	__P((struct proc *, void *, register_t *));
 int	sys_chmod	__P((struct proc *, void *, register_t *));
 int	sys_chown	__P((struct proc *, void *, register_t *));
 int	sys_obreak	__P((struct proc *, void *, register_t *));
-int	sys_ogetfsstat	__P((struct proc *, void *, register_t *));
+int	compat_25_sys_getfsstat	__P((struct proc *, void *, register_t *));
 int	compat_43_sys_lseek	__P((struct proc *, void *, register_t *));
 int	sys_getpid	__P((struct proc *, void *, register_t *));
 int	sys_mount	__P((struct proc *, void *, register_t *));
@@ -171,8 +171,8 @@ int	sys_nfssvc	__P((struct proc *, void *, register_t *));
 #else
 #endif
 int	compat_43_sys_getdirentries	__P((struct proc *, void *, register_t *));
-int	sys_ostatfs	__P((struct proc *, void *, register_t *));
-int	sys_ofstatfs	__P((struct proc *, void *, register_t *));
+int	compat_25_sys_statfs	__P((struct proc *, void *, register_t *));
+int	compat_25_sys_fstatfs	__P((struct proc *, void *, register_t *));
 #ifdef NFSCLIENT
 int	sys_getfh	__P((struct proc *, void *, register_t *));
 #else
diff --git a/sys/compat/bsdos/bsdos_syscalls.c b/sys/compat/bsdos/bsdos_syscalls.c
index 35a1cbff549..0bdb0cd3dba 100644
--- a/sys/compat/bsdos/bsdos_syscalls.c
+++ b/sys/compat/bsdos/bsdos_syscalls.c
@@ -1,10 +1,10 @@
-/*	$OpenBSD: bsdos_syscalls.c,v 1.7 2000/05/01 23:12:28 deraadt Exp $	*/
+/*	$OpenBSD: bsdos_syscalls.c,v 1.8 2001/05/16 17:17:05 millert Exp $	*/
 
 /*
  * System call names.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	OpenBSD: syscalls.master,v 1.7 2000/05/01 23:10:58 deraadt Exp 
+ * created from	OpenBSD: syscalls.master,v 1.8 2001/05/16 17:14:37 millert Exp 
  */
 
 char *bsdos_syscallnames[] = {
@@ -26,7 +26,7 @@ char *bsdos_syscallnames[] = {
 	"chmod",			/* 15 = chmod */
 	"chown",			/* 16 = chown */
 	"break",			/* 17 = break */
-	"ogetfsstat",			/* 18 = ogetfsstat */
+	"getfsstat",			/* 18 = getfsstat */
 	"olseek",			/* 19 = olseek */
 	"getpid",			/* 20 = getpid */
 	"mount",			/* 21 = mount */
@@ -177,8 +177,8 @@ char *bsdos_syscallnames[] = {
 	"#155 (unimplemented)",		/* 155 = unimplemented */
 #endif
 	"ogetdirentries",			/* 156 = ogetdirentries */
-	"ostatfs",			/* 157 = ostatfs */
-	"ofstatfs",			/* 158 = ofstatfs */
+	"statfs",			/* 157 = statfs */
+	"fstatfs",			/* 158 = fstatfs */
 	"#159 (unimplemented)",		/* 159 = unimplemented */
 	"#160 (unimplemented)",		/* 160 = unimplemented */
 #ifdef NFSCLIENT
diff --git a/sys/compat/bsdos/bsdos_sysent.c b/sys/compat/bsdos/bsdos_sysent.c
index 6dae19475f6..0210b8c8e17 100644
--- a/sys/compat/bsdos/bsdos_sysent.c
+++ b/sys/compat/bsdos/bsdos_sysent.c
@@ -1,10 +1,10 @@
-/*	$OpenBSD: bsdos_sysent.c,v 1.7 2000/05/01 23:12:28 deraadt Exp $	*/
+/*	$OpenBSD: bsdos_sysent.c,v 1.8 2001/05/16 17:17:06 millert Exp $	*/
 
 /*
  * System call switch table.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	OpenBSD: syscalls.master,v 1.7 2000/05/01 23:10:58 deraadt Exp 
+ * created from	OpenBSD: syscalls.master,v 1.8 2001/05/16 17:14:37 millert Exp 
  */
 
 #include <sys/param.h>
@@ -53,8 +53,8 @@ struct sysent bsdos_sysent[] = {
 	    sys_chown },			/* 16 = chown */
 	{ 1, s(struct sys_obreak_args),
 	    sys_obreak },			/* 17 = break */
-	{ 3, s(struct sys_ogetfsstat_args),
-	    sys_ogetfsstat },			/* 18 = ogetfsstat */
+	{ 3, s(struct compat_25_sys_getfsstat_args),
+	    compat_25_sys_getfsstat },		/* 18 = getfsstat */
 	{ 3, s(struct compat_43_sys_lseek_args),
 	    compat_43_sys_lseek },		/* 19 = olseek */
 	{ 0, 0,
@@ -346,10 +346,10 @@ struct sysent bsdos_sysent[] = {
 #endif
 	{ 4, s(struct compat_43_sys_getdirentries_args),
 	    compat_43_sys_getdirentries },	/* 156 = ogetdirentries */
-	{ 2, s(struct sys_ostatfs_args),
-	    sys_ostatfs },			/* 157 = ostatfs */
-	{ 2, s(struct sys_ofstatfs_args),
-	    sys_ofstatfs },			/* 158 = ofstatfs */
+	{ 2, s(struct compat_25_sys_statfs_args),
+	    compat_25_sys_statfs },		/* 157 = statfs */
+	{ 2, s(struct compat_25_sys_fstatfs_args),
+	    compat_25_sys_fstatfs },		/* 158 = fstatfs */
 	{ 0, 0,
 	    sys_nosys },			/* 159 = unimplemented */
 	{ 0, 0,
diff --git a/sys/compat/netbsd/netbsd_syscall.h b/sys/compat/netbsd/netbsd_syscall.h
index 2af3831be93..faefa0fd0f9 100644
--- a/sys/compat/netbsd/netbsd_syscall.h
+++ b/sys/compat/netbsd/netbsd_syscall.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: netbsd_syscall.h,v 1.11 2000/05/01 23:12:29 deraadt Exp $	*/
+/*	$OpenBSD: netbsd_syscall.h,v 1.12 2001/05/16 17:17:06 millert Exp $	*/
 
 /*
  * System call numbers.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from;	OpenBSD: syscalls.master,v 1.11 2000/05/01 23:10:58 deraadt Exp 
+ * created from;	OpenBSD: syscalls.master,v 1.12 2001/05/16 17:14:38 millert Exp 
  */
 
 /* syscall: "syscall" ret: "int" args: "int" "..." */
@@ -59,8 +59,8 @@
 /* syscall: "break" ret: "int" args: "char *" */
 #define	NETBSD_SYS_break	17
 
-/* syscall: "ogetfsstat" ret: "int" args: "struct statfs *" "long" "int" */
-#define	NETBSD_SYS_ogetfsstat	18
+/* syscall: "getfsstat" ret: "int" args: "struct ostatfs *" "long" "int" */
+#define	NETBSD_SYS_getfsstat	18
 
 /* syscall: "olseek" ret: "long" args: "int" "long" "int" */
 #define	NETBSD_SYS_olseek	19
@@ -445,11 +445,11 @@
 /* syscall: "ogetdirentries" ret: "int" args: "int" "char *" "u_int" "long *" */
 #define	NETBSD_SYS_ogetdirentries	156
 
-/* syscall: "ostatfs" ret: "int" args: "char *" "struct ostatfs *" */
-#define	NETBSD_SYS_ostatfs	157
+/* syscall: "statfs" ret: "int" args: "char *" "struct ostatfs *" */
+#define	NETBSD_SYS_statfs	157
 
-/* syscall: "ofstatfs" ret: "int" args: "int" "struct ostatfs *" */
-#define	NETBSD_SYS_ofstatfs	158
+/* syscall: "fstatfs" ret: "int" args: "int" "struct ostatfs *" */
+#define	NETBSD_SYS_fstatfs	158
 
 /* syscall: "getfh" ret: "int" args: "const char *" "fhandle_t *" */
 #define	NETBSD_SYS_getfh	161
diff --git a/sys/compat/netbsd/netbsd_syscallargs.h b/sys/compat/netbsd/netbsd_syscallargs.h
index 42f04f17416..be7ff91bf46 100644
--- a/sys/compat/netbsd/netbsd_syscallargs.h
+++ b/sys/compat/netbsd/netbsd_syscallargs.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: netbsd_syscallargs.h,v 1.11 2000/05/01 23:12:29 deraadt Exp $	*/
+/*	$OpenBSD: netbsd_syscallargs.h,v 1.12 2001/05/16 17:17:06 millert Exp $	*/
 
 /*
  * System call argument lists.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from;	OpenBSD: syscalls.master,v 1.11 2000/05/01 23:10:58 deraadt Exp 
+ * created from;	OpenBSD: syscalls.master,v 1.12 2001/05/16 17:14:38 millert Exp 
  */
 
 #define	syscallarg(x)	union { x datum; register_t pad; }
@@ -266,7 +266,7 @@ int	netbsd_sys_mknod	__P((struct proc *, void *, register_t *));
 int	netbsd_sys_chmod	__P((struct proc *, void *, register_t *));
 int	netbsd_sys_chown	__P((struct proc *, void *, register_t *));
 int	sys_obreak	__P((struct proc *, void *, register_t *));
-int	sys_ogetfsstat	__P((struct proc *, void *, register_t *));
+int	compat_25_sys_getfsstat	__P((struct proc *, void *, register_t *));
 int	sys_lseek	__P((struct proc *, void *, register_t *));
 int	sys_getpid	__P((struct proc *, void *, register_t *));
 int	sys_mount	__P((struct proc *, void *, register_t *));
@@ -401,8 +401,8 @@ int	sys_nfssvc	__P((struct proc *, void *, register_t *));
 #else
 #endif
 int	compat_43_sys_getdirentries	__P((struct proc *, void *, register_t *));
-int	sys_ostatfs	__P((struct proc *, void *, register_t *));
-int	sys_ofstatfs	__P((struct proc *, void *, register_t *));
+int	compat_25_sys_statfs	__P((struct proc *, void *, register_t *));
+int	compat_25_sys_fstatfs	__P((struct proc *, void *, register_t *));
 #if defined(NFSCLIENT) || defined(NFSSERVER)
 int	sys_getfh	__P((struct proc *, void *, register_t *));
 #else
diff --git a/sys/compat/netbsd/netbsd_syscalls.c b/sys/compat/netbsd/netbsd_syscalls.c
index 9e6ce508cb8..9054c2cdf13 100644
--- a/sys/compat/netbsd/netbsd_syscalls.c
+++ b/sys/compat/netbsd/netbsd_syscalls.c
@@ -1,10 +1,10 @@
-/*	$OpenBSD: netbsd_syscalls.c,v 1.11 2000/05/01 23:12:29 deraadt Exp $	*/
+/*	$OpenBSD: netbsd_syscalls.c,v 1.12 2001/05/16 17:17:07 millert Exp $	*/
 
 /*
  * System call names.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from;	OpenBSD: syscalls.master,v 1.11 2000/05/01 23:10:58 deraadt Exp 
+ * created from;	OpenBSD: syscalls.master,v 1.12 2001/05/16 17:14:38 millert Exp 
  */
 
 char *netbsd_syscallnames[] = {
@@ -26,7 +26,7 @@ char *netbsd_syscallnames[] = {
 	"chmod",			/* 15 = chmod */
 	"chown",			/* 16 = chown */
 	"break",			/* 17 = break */
-	"ogetfsstat",			/* 18 = ogetfsstat */
+	"getfsstat",			/* 18 = getfsstat */
 	"olseek",			/* 19 = olseek */
 	"getpid",			/* 20 = getpid */
 	"mount",			/* 21 = mount */
@@ -177,8 +177,8 @@ char *netbsd_syscallnames[] = {
 	"#155 (unimplemented)",		/* 155 = unimplemented */
 #endif
 	"ogetdirentries",			/* 156 = ogetdirentries */
-	"ostatfs",			/* 157 = ostatfs */
-	"ofstatfs",			/* 158 = ofstatfs */
+	"statfs",			/* 157 = statfs */
+	"fstatfs",			/* 158 = fstatfs */
 	"#159 (unimplemented)",		/* 159 = unimplemented */
 	"#160 (unimplemented)",		/* 160 = unimplemented */
 #if defined(NFSCLIENT) || defined(NFSSERVER)
diff --git a/sys/compat/netbsd/netbsd_sysent.c b/sys/compat/netbsd/netbsd_sysent.c
index d90aec1d102..d733e3c6373 100644
--- a/sys/compat/netbsd/netbsd_sysent.c
+++ b/sys/compat/netbsd/netbsd_sysent.c
@@ -1,10 +1,10 @@
-/*	$OpenBSD: netbsd_sysent.c,v 1.11 2000/05/01 23:12:29 deraadt Exp $	*/
+/*	$OpenBSD: netbsd_sysent.c,v 1.12 2001/05/16 17:17:07 millert Exp $	*/
 
 /*
  * System call switch table.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from;	OpenBSD: syscalls.master,v 1.11 2000/05/01 23:10:58 deraadt Exp 
+ * created from;	OpenBSD: syscalls.master,v 1.12 2001/05/16 17:14:38 millert Exp 
  */
 
 #include <sys/param.h>
@@ -58,8 +58,8 @@ struct sysent netbsd_sysent[] = {
 	    netbsd_sys_chown },			/* 16 = chown */
 	{ 1, s(struct sys_obreak_args),
 	    sys_obreak },			/* 17 = break */
-	{ 3, s(struct sys_ogetfsstat_args),
-	    sys_ogetfsstat },			/* 18 = ogetfsstat */
+	{ 3, s(struct compat_25_sys_getfsstat_args),
+	    compat_25_sys_getfsstat },		/* 18 = getfsstat */
 	{ 3, s(struct sys_lseek_args),
 	    sys_lseek },			/* 19 = olseek */
 	{ 0, 0,
@@ -351,10 +351,10 @@ struct sysent netbsd_sysent[] = {
 #endif
 	{ 4, s(struct compat_43_sys_getdirentries_args),
 	    compat_43_sys_getdirentries },	/* 156 = ogetdirentries */
-	{ 2, s(struct sys_ostatfs_args),
-	    sys_ostatfs },			/* 157 = ostatfs */
-	{ 2, s(struct sys_ofstatfs_args),
-	    sys_ofstatfs },			/* 158 = ofstatfs */
+	{ 2, s(struct compat_25_sys_statfs_args),
+	    compat_25_sys_statfs },		/* 157 = statfs */
+	{ 2, s(struct compat_25_sys_fstatfs_args),
+	    compat_25_sys_fstatfs },		/* 158 = fstatfs */
 	{ 0, 0,
 	    sys_nosys },			/* 159 = unimplemented */
 	{ 0, 0,
diff --git a/sys/kern/init_sysent.c b/sys/kern/init_sysent.c
index 3d35692a03e..0140afdd85d 100644
--- a/sys/kern/init_sysent.c
+++ b/sys/kern/init_sysent.c
@@ -1,10 +1,10 @@
-/*	$OpenBSD: init_sysent.c,v 1.49 2001/03/09 15:12:52 art Exp $	*/
+/*	$OpenBSD: init_sysent.c,v 1.50 2001/05/16 17:17:04 millert Exp $	*/
 
 /*
  * System call switch table.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from;	OpenBSD: syscalls.master,v 1.44 2001/03/09 15:11:47 art Exp 
+ * created from;	OpenBSD: syscalls.master,v 1.45 2001/05/16 17:14:35 millert Exp 
  */
 
 #include <sys/param.h>
@@ -32,6 +32,18 @@
 #define compat_10(func) sys_nosys
 #endif
 
+#ifdef COMPAT_23
+#define compat_23(func) __CONCAT(compat_23_,func)
+#else
+#define compat_23(func) sys_nosys
+#endif
+
+#ifdef COMPAT_25
+#define compat_25(func) __CONCAT(compat_25_,func)
+#else
+#define compat_25(func) sys_nosys
+#endif
+
 #define	s(type)	sizeof(type)
 
 struct sysent sysent[] = {
@@ -71,8 +83,8 @@ struct sysent sysent[] = {
 	    sys_chown },			/* 16 = chown */
 	{ 1, s(struct sys_obreak_args),
 	    sys_obreak },			/* 17 = break */
-	{ 3, s(struct sys_ogetfsstat_args),
-	    sys_ogetfsstat },			/* 18 = ogetfsstat */
+	{ 3, s(struct compat_25_sys_getfsstat_args),
+	    compat_25(sys_getfsstat) },		/* 18 = compat_25 ogetfsstat */
 	{ 3, s(struct compat_43_sys_lseek_args),
 	    compat_43(sys_lseek) },		/* 19 = compat_43 olseek */
 	{ 0, 0,
@@ -359,10 +371,10 @@ struct sysent sysent[] = {
 #endif
 	{ 4, s(struct compat_43_sys_getdirentries_args),
 	    compat_43(sys_getdirentries) },	/* 156 = compat_43 ogetdirentries */
-	{ 2, s(struct sys_ostatfs_args),
-	    sys_ostatfs },			/* 157 = ostatfs */
-	{ 2, s(struct sys_ofstatfs_args),
-	    sys_ofstatfs },			/* 158 = ofstatfs */
+	{ 2, s(struct compat_25_sys_statfs_args),
+	    compat_25(sys_statfs) },		/* 157 = compat_25 ostatfs */
+	{ 2, s(struct compat_25_sys_fstatfs_args),
+	    compat_25(sys_fstatfs) },		/* 158 = compat_25 ostatfs */
 	{ 0, 0,
 	    sys_nosys },			/* 159 = unimplemented */
 	{ 0, 0,
@@ -542,8 +554,8 @@ struct sysent sysent[] = {
 	    sys_nosys },			/* 219 = unimplemented */
 #endif	/* !LKM */
 #ifdef SYSVSEM
-	{ 4, s(struct sys___osemctl_args),
-	    sys___osemctl },			/* 220 = __osemctl */
+	{ 4, s(struct compat_23_sys___semctl_args),
+	    compat_23(sys___semctl) },		/* 220 = compat_23 __osemctl */
 	{ 3, s(struct sys_semget_args),
 	    sys_semget },			/* 221 = semget */
 	{ 3, s(struct sys_semop_args),
@@ -561,8 +573,8 @@ struct sysent sysent[] = {
 	    sys_nosys },			/* 223 = unimplemented semconfig */
 #endif
 #ifdef SYSVMSG
-	{ 3, s(struct sys_omsgctl_args),
-	    sys_omsgctl },			/* 224 = omsgctl */
+	{ 3, s(struct compat_23_sys_msgctl_args),
+	    compat_23(sys_msgctl) },		/* 224 = compat_23 omsgctl */
 	{ 2, s(struct sys_msgget_args),
 	    sys_msgget },			/* 225 = msgget */
 	{ 4, s(struct sys_msgsnd_args),
@@ -582,8 +594,8 @@ struct sysent sysent[] = {
 #ifdef SYSVSHM
 	{ 3, s(struct sys_shmat_args),
 	    sys_shmat },			/* 228 = shmat */
-	{ 3, s(struct sys_oshmctl_args),
-	    sys_oshmctl },			/* 229 = oshmctl */
+	{ 3, s(struct compat_23_sys_shmctl_args),
+	    compat_23(sys_shmctl) },		/* 229 = compat_23 oshmctl */
 	{ 1, s(struct sys_shmdt_args),
 	    sys_shmdt },			/* 230 = shmdt */
 	{ 3, s(struct sys_shmget_args),
diff --git a/sys/kern/syscalls.c b/sys/kern/syscalls.c
index de384bf0a0d..239f3ca6db3 100644
--- a/sys/kern/syscalls.c
+++ b/sys/kern/syscalls.c
@@ -1,10 +1,10 @@
-/*	$OpenBSD: syscalls.c,v 1.49 2001/03/09 15:12:52 art Exp $	*/
+/*	$OpenBSD: syscalls.c,v 1.50 2001/05/16 17:17:04 millert Exp $	*/
 
 /*
  * System call names.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from;	OpenBSD: syscalls.master,v 1.44 2001/03/09 15:11:47 art Exp 
+ * created from;	OpenBSD: syscalls.master,v 1.45 2001/05/16 17:14:35 millert Exp 
  */
 
 char *syscallnames[] = {
@@ -26,7 +26,7 @@ char *syscallnames[] = {
 	"chmod",			/* 15 = chmod */
 	"chown",			/* 16 = chown */
 	"break",			/* 17 = break */
-	"ogetfsstat",			/* 18 = ogetfsstat */
+	"compat_25_ogetfsstat",	/* 18 = compat_25 ogetfsstat */
 	"compat_43_olseek",	/* 19 = compat_43 olseek */
 	"getpid",			/* 20 = getpid */
 	"mount",			/* 21 = mount */
@@ -173,8 +173,8 @@ char *syscallnames[] = {
 	"#155 (unimplemented)",		/* 155 = unimplemented */
 #endif
 	"compat_43_ogetdirentries",	/* 156 = compat_43 ogetdirentries */
-	"ostatfs",			/* 157 = ostatfs */
-	"ofstatfs",			/* 158 = ofstatfs */
+	"compat_25_ostatfs",	/* 157 = compat_25 ostatfs */
+	"compat_25_ostatfs",	/* 158 = compat_25 ostatfs */
 	"#159 (unimplemented)",		/* 159 = unimplemented */
 	"#160 (unimplemented)",		/* 160 = unimplemented */
 	"getfh",			/* 161 = getfh */
@@ -274,7 +274,7 @@ char *syscallnames[] = {
 	"#219 (unimplemented)",		/* 219 = unimplemented */
 #endif	/* !LKM */
 #ifdef SYSVSEM
-	"__osemctl",			/* 220 = __osemctl */
+	"compat_23___osemctl",	/* 220 = compat_23 __osemctl */
 	"semget",			/* 221 = semget */
 	"semop",			/* 222 = semop */
 	"#223 (obsolete sys_semconfig)",		/* 223 = obsolete sys_semconfig */
@@ -285,7 +285,7 @@ char *syscallnames[] = {
 	"#223 (unimplemented semconfig)",		/* 223 = unimplemented semconfig */
 #endif
 #ifdef SYSVMSG
-	"omsgctl",			/* 224 = omsgctl */
+	"compat_23_omsgctl",	/* 224 = compat_23 omsgctl */
 	"msgget",			/* 225 = msgget */
 	"msgsnd",			/* 226 = msgsnd */
 	"msgrcv",			/* 227 = msgrcv */
@@ -297,7 +297,7 @@ char *syscallnames[] = {
 #endif
 #ifdef SYSVSHM
 	"shmat",			/* 228 = shmat */
-	"oshmctl",			/* 229 = oshmctl */
+	"compat_23_oshmctl",	/* 229 = compat_23 oshmctl */
 	"shmdt",			/* 230 = shmdt */
 	"shmget",			/* 231 = shmget */
 #else
diff --git a/sys/sys/syscall.h b/sys/sys/syscall.h
index a775dabbedf..94665c3f1d9 100644
--- a/sys/sys/syscall.h
+++ b/sys/sys/syscall.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: syscall.h,v 1.48 2001/03/09 15:12:53 art Exp $	*/
+/*	$OpenBSD: syscall.h,v 1.49 2001/05/16 17:17:03 millert Exp $	*/
 
 /*
  * System call numbers.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from;	OpenBSD: syscalls.master,v 1.44 2001/03/09 15:11:47 art Exp 
+ * created from;	OpenBSD: syscalls.master,v 1.45 2001/05/16 17:14:35 millert Exp 
  */
 
 /* syscall: "syscall" ret: "int" args: "int" "..." */
@@ -58,8 +58,7 @@
 /* syscall: "break" ret: "int" args: "char *" */
 #define	SYS_break	17
 
-/* syscall: "ogetfsstat" ret: "int" args: "struct statfs *" "long" "int" */
-#define	SYS_ogetfsstat	18
+				/* 18 is compat_25 ogetfsstat */
 
 				/* 19 is compat_43 olseek */
 
@@ -407,11 +406,9 @@
 
 				/* 156 is compat_43 ogetdirentries */
 
-/* syscall: "ostatfs" ret: "int" args: "const char *" "struct ostatfs *" */
-#define	SYS_ostatfs	157
+				/* 157 is compat_25 ostatfs */
 
-/* syscall: "ofstatfs" ret: "int" args: "int" "struct ostatfs *" */
-#define	SYS_ofstatfs	158
+				/* 158 is compat_25 ostatfs */
 
 /* syscall: "getfh" ret: "int" args: "const char *" "fhandle_t *" */
 #define	SYS_getfh	161
@@ -527,8 +524,7 @@
 /* syscall: "xfspioctl" ret: "int" args: "int" "char *" "int" "struct ViceIoctl *" "int" */
 #define	SYS_xfspioctl	208
 
-/* syscall: "__osemctl" ret: "int" args: "int" "int" "int" "union semun *" */
-#define	SYS___osemctl	220
+				/* 220 is compat_23 __osemctl */
 
 /* syscall: "semget" ret: "int" args: "key_t" "int" "int" */
 #define	SYS_semget	221
@@ -537,8 +533,7 @@
 #define	SYS_semop	222
 
 				/* 223 is obsolete sys_semconfig */
-/* syscall: "omsgctl" ret: "int" args: "int" "int" "struct omsqid_ds *" */
-#define	SYS_omsgctl	224
+				/* 224 is compat_23 omsgctl */
 
 /* syscall: "msgget" ret: "int" args: "key_t" "int" */
 #define	SYS_msgget	225
@@ -552,8 +547,7 @@
 /* syscall: "shmat" ret: "void *" args: "int" "const void *" "int" */
 #define	SYS_shmat	228
 
-/* syscall: "oshmctl" ret: "int" args: "int" "int" "struct oshmid_ds *" */
-#define	SYS_oshmctl	229
+				/* 229 is compat_23 oshmctl */
 
 /* syscall: "shmdt" ret: "int" args: "const void *" */
 #define	SYS_shmdt	230
diff --git a/sys/sys/syscallargs.h b/sys/sys/syscallargs.h
index d5a65dc5cb7..08cadbe2064 100644
--- a/sys/sys/syscallargs.h
+++ b/sys/sys/syscallargs.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: syscallargs.h,v 1.49 2001/03/09 15:12:53 art Exp $	*/
+/*	$OpenBSD: syscallargs.h,v 1.50 2001/05/16 17:17:04 millert Exp $	*/
 
 /*
  * System call argument lists.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from;	OpenBSD: syscalls.master,v 1.44 2001/03/09 15:11:47 art Exp 
+ * created from;	OpenBSD: syscalls.master,v 1.45 2001/05/16 17:14:35 millert Exp 
  */
 
 #define	syscallarg(x)	union { x datum; register_t pad; }
@@ -85,7 +85,7 @@ struct sys_obreak_args {
 	syscallarg(char *) nsize;
 };
 
-struct sys_ogetfsstat_args {
+struct compat_25_sys_getfsstat_args {
 	syscallarg(struct statfs *) buf;
 	syscallarg(long) bufsize;
 	syscallarg(int) flags;
@@ -680,12 +680,12 @@ struct compat_43_sys_getdirentries_args {
 	syscallarg(long *) basep;
 };
 
-struct sys_ostatfs_args {
+struct compat_25_sys_statfs_args {
 	syscallarg(const char *) path;
 	syscallarg(struct ostatfs *) buf;
 };
 
-struct sys_ofstatfs_args {
+struct compat_25_sys_fstatfs_args {
 	syscallarg(int) fd;
 	syscallarg(struct ostatfs *) buf;
 };
@@ -913,7 +913,7 @@ struct sys_xfspioctl_args {
 	syscallarg(int) a_followSymlinks;
 };
 
-struct sys___osemctl_args {
+struct compat_23_sys___semctl_args {
 	syscallarg(int) semid;
 	syscallarg(int) semnum;
 	syscallarg(int) cmd;
@@ -932,7 +932,7 @@ struct sys_semop_args {
 	syscallarg(u_int) nsops;
 };
 
-struct sys_omsgctl_args {
+struct compat_23_sys_msgctl_args {
 	syscallarg(int) msqid;
 	syscallarg(int) cmd;
 	syscallarg(struct omsqid_ds *) buf;
@@ -964,7 +964,7 @@ struct sys_shmat_args {
 	syscallarg(int) shmflg;
 };
 
-struct sys_oshmctl_args {
+struct compat_23_sys_shmctl_args {
 	syscallarg(int) shmid;
 	syscallarg(int) cmd;
 	syscallarg(struct oshmid_ds *) buf;
@@ -1135,7 +1135,7 @@ int	sys_mknod	__P((struct proc *, void *, register_t *));
 int	sys_chmod	__P((struct proc *, void *, register_t *));
 int	sys_chown	__P((struct proc *, void *, register_t *));
 int	sys_obreak	__P((struct proc *, void *, register_t *));
-int	sys_ogetfsstat	__P((struct proc *, void *, register_t *));
+int	compat_25_sys_getfsstat	__P((struct proc *, void *, register_t *));
 int	compat_43_sys_lseek	__P((struct proc *, void *, register_t *));
 int	sys_getpid	__P((struct proc *, void *, register_t *));
 int	sys_mount	__P((struct proc *, void *, register_t *));
@@ -1266,8 +1266,8 @@ int	sys_nfssvc	__P((struct proc *, void *, register_t *));
 #else
 #endif
 int	compat_43_sys_getdirentries	__P((struct proc *, void *, register_t *));
-int	sys_ostatfs	__P((struct proc *, void *, register_t *));
-int	sys_ofstatfs	__P((struct proc *, void *, register_t *));
+int	compat_25_sys_statfs	__P((struct proc *, void *, register_t *));
+int	compat_25_sys_fstatfs	__P((struct proc *, void *, register_t *));
 int	sys_getfh	__P((struct proc *, void *, register_t *));
 int	compat_09_sys_getdomainname	__P((struct proc *, void *, register_t *));
 int	compat_09_sys_setdomainname	__P((struct proc *, void *, register_t *));
@@ -1336,13 +1336,13 @@ int	sys_lkmnosys	__P((struct proc *, void *, register_t *));
 #else	/* !LKM */
 #endif	/* !LKM */
 #ifdef SYSVSEM
-int	sys___osemctl	__P((struct proc *, void *, register_t *));
+int	compat_23_sys___semctl	__P((struct proc *, void *, register_t *));
 int	sys_semget	__P((struct proc *, void *, register_t *));
 int	sys_semop	__P((struct proc *, void *, register_t *));
 #else
 #endif
 #ifdef SYSVMSG
-int	sys_omsgctl	__P((struct proc *, void *, register_t *));
+int	compat_23_sys_msgctl	__P((struct proc *, void *, register_t *));
 int	sys_msgget	__P((struct proc *, void *, register_t *));
 int	sys_msgsnd	__P((struct proc *, void *, register_t *));
 int	sys_msgrcv	__P((struct proc *, void *, register_t *));
@@ -1350,7 +1350,7 @@ int	sys_msgrcv	__P((struct proc *, void *, register_t *));
 #endif
 #ifdef SYSVSHM
 int	sys_shmat	__P((struct proc *, void *, register_t *));
-int	sys_oshmctl	__P((struct proc *, void *, register_t *));
+int	compat_23_sys_shmctl	__P((struct proc *, void *, register_t *));
 int	sys_shmdt	__P((struct proc *, void *, register_t *));
 int	sys_shmget	__P((struct proc *, void *, register_t *));
 #else