regen

5 files changed, 94 insertions, 43 deletions

diff --git a/sys/kern/init_sysent.c b/sys/kern/init_sysent.c
index bd9900ed5f0..12fc85e329f 100644
--- a/sys/kern/init_sysent.c
+++ b/sys/kern/init_sysent.c
@@ -1,10 +1,10 @@
-/*	$OpenBSD: init_sysent.c,v 1.102 2008/01/05 00:38:13 miod Exp $	*/
+/*	$OpenBSD: init_sysent.c,v 1.103 2008/03/16 19:43:41 otto Exp $	*/
 
 /*
  * System call switch table.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from;	OpenBSD: syscalls.master,v 1.89 2008/01/05 00:36:13 miod Exp 
+ * created from;	OpenBSD: syscalls.master,v 1.90 2008/03/16 19:42:57 otto Exp 
  */
 
 #include <sys/param.h>
@@ -52,6 +52,12 @@
 #define compat_35(func) sys_nosys
 #endif
 
+#ifdef COMPAT_O43
+#define compat_o43(func) __CONCAT(compat_o43_,func)
+#else
+#define compat_o43(func) sys_nosys
+#endif
+
 #define	s(type)	sizeof(type)
 
 struct sysent sysent[] = {
@@ -692,20 +698,20 @@ struct sysent sysent[] = {
 	{ 0, 0, 0,
 	    sys_nosys },			/* 259 = unimplemented */
 #endif
-	{ 3, s(struct sys_getfsstat_args), 0,
-	    sys_getfsstat },			/* 260 = getfsstat */
-	{ 2, s(struct sys_statfs_args), 0,
-	    sys_statfs },			/* 261 = statfs */
-	{ 2, s(struct sys_fstatfs_args), 0,
-	    sys_fstatfs },			/* 262 = fstatfs */
+	{ 3, s(struct compat_o43_sys_getfsstat_args), 0,
+	    compat_o43(sys_getfsstat) },	/* 260 = compat_o43 getfsstat */
+	{ 2, s(struct compat_o43_sys_statfs_args), 0,
+	    compat_o43(sys_statfs) },		/* 261 = compat_o43 statfs */
+	{ 2, s(struct compat_o43_sys_fstatfs_args), 0,
+	    compat_o43(sys_fstatfs) },		/* 262 = compat_o43 fstatfs */
 	{ 1, s(struct sys_pipe_args), 0,
 	    sys_pipe },				/* 263 = pipe */
 	{ 2, s(struct sys_fhopen_args), 0,
 	    sys_fhopen },			/* 264 = fhopen */
 	{ 2, s(struct compat_35_sys_fhstat_args), 0,
 	    compat_35(sys_fhstat) },		/* 265 = compat_35 fhstat */
-	{ 2, s(struct sys_fhstatfs_args), 0,
-	    sys_fhstatfs },			/* 266 = fhstatfs */
+	{ 2, s(struct compat_o43_sys_fhstatfs_args), 0,
+	    compat_o43(sys_fhstatfs) },		/* 266 = compat_o43 fhstatfs */
 	{ 5, s(struct sys_preadv_args), 0,
 	    sys_preadv },			/* 267 = preadv */
 	{ 5, s(struct sys_pwritev_args), 0,
@@ -822,5 +828,13 @@ struct sysent sysent[] = {
 	    sys___getcwd },			/* 304 = __getcwd */
 	{ 2, s(struct sys_adjfreq_args), 0,
 	    sys_adjfreq },			/* 305 = adjfreq */
+	{ 3, s(struct sys_getfsstat_args), 0,
+	    sys_getfsstat },			/* 306 = getfsstat */
+	{ 2, s(struct sys_statfs_args), 0,
+	    sys_statfs },			/* 307 = statfs */
+	{ 2, s(struct sys_fstatfs_args), 0,
+	    sys_fstatfs },			/* 308 = fstatfs */
+	{ 2, s(struct sys_fhstatfs_args), 0,
+	    sys_fhstatfs },			/* 309 = fhstatfs */
 };
 
diff --git a/sys/kern/syscalls.c b/sys/kern/syscalls.c
index c8574b094b7..4fb35f0fb42 100644
--- a/sys/kern/syscalls.c
+++ b/sys/kern/syscalls.c
@@ -1,10 +1,10 @@
-/*	$OpenBSD: syscalls.c,v 1.103 2008/01/05 00:38:13 miod Exp $	*/
+/*	$OpenBSD: syscalls.c,v 1.104 2008/03/16 19:43:41 otto Exp $	*/
 
 /*
  * System call names.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from;	OpenBSD: syscalls.master,v 1.89 2008/01/05 00:36:13 miod Exp 
+ * created from;	OpenBSD: syscalls.master,v 1.90 2008/03/16 19:42:57 otto Exp 
  */
 
 char *syscallnames[] = {
@@ -349,13 +349,13 @@ char *syscallnames[] = {
 #else
 	"#259 (unimplemented)",		/* 259 = unimplemented */
 #endif
-	"getfsstat",			/* 260 = getfsstat */
-	"statfs",			/* 261 = statfs */
-	"fstatfs",			/* 262 = fstatfs */
+	"compat_o43_getfsstat",	/* 260 = compat_o43 getfsstat */
+	"compat_o43_statfs",	/* 261 = compat_o43 statfs */
+	"compat_o43_fstatfs",	/* 262 = compat_o43 fstatfs */
 	"pipe",			/* 263 = pipe */
 	"fhopen",			/* 264 = fhopen */
 	"compat_35_fhstat",	/* 265 = compat_35 fhstat */
-	"fhstatfs",			/* 266 = fhstatfs */
+	"compat_o43_fhstatfs",	/* 266 = compat_o43 fhstatfs */
 	"preadv",			/* 267 = preadv */
 	"pwritev",			/* 268 = pwritev */
 	"kqueue",			/* 269 = kqueue */
@@ -423,4 +423,8 @@ char *syscallnames[] = {
 #endif
 	"__getcwd",			/* 304 = __getcwd */
 	"adjfreq",			/* 305 = adjfreq */
+	"getfsstat",			/* 306 = getfsstat */
+	"statfs",			/* 307 = statfs */
+	"fstatfs",			/* 308 = fstatfs */
+	"fhstatfs",			/* 309 = fhstatfs */
 };
diff --git a/sys/kern/syscalls.conf b/sys/kern/syscalls.conf
index a3ecd66c8d1..6fafbfcd75f 100644
--- a/sys/kern/syscalls.conf
+++ b/sys/kern/syscalls.conf
@@ -1,11 +1,11 @@
-#	$OpenBSD: syscalls.conf,v 1.6 2004/05/03 17:38:48 millert Exp $
+#	$OpenBSD: syscalls.conf,v 1.7 2008/03/16 19:43:41 otto Exp $
 #	$NetBSD: syscalls.conf,v 1.2 1994/10/26 06:45:57 cgd Exp $
 
 sysnames="syscalls.c"
 sysnumhdr="../sys/syscall.h"
 syssw="init_sysent.c"
 sysarghdr="../sys/syscallargs.h"
-compatopts="compat_43 compat_09 compat_10 compat_23 compat_25 compat_35"
+compatopts="compat_43 compat_09 compat_10 compat_23 compat_25 compat_35 compat_o43"
 libcompatopts=""
 
 switchname="sysent"
diff --git a/sys/sys/syscall.h b/sys/sys/syscall.h
index 2ef394c2d32..b00b275f7f0 100644
--- a/sys/sys/syscall.h
+++ b/sys/sys/syscall.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: syscall.h,v 1.100 2008/01/05 00:38:13 miod Exp $	*/
+/*	$OpenBSD: syscall.h,v 1.101 2008/03/16 19:43:41 otto Exp $	*/
 
 /*
  * System call numbers.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from;	OpenBSD: syscalls.master,v 1.89 2008/01/05 00:36:13 miod Exp 
+ * created from;	OpenBSD: syscalls.master,v 1.90 2008/03/16 19:42:57 otto Exp 
  */
 
 /* syscall: "syscall" ret: "int" args: "int" "..." */
@@ -576,14 +576,11 @@
 
 				/* 259 is compat_35 msgctl35 */
 
-/* syscall: "getfsstat" ret: "int" args: "struct statfs *" "size_t" "int" */
-#define	SYS_getfsstat	260
+				/* 260 is compat_o43 getfsstat */
 
-/* syscall: "statfs" ret: "int" args: "const char *" "struct statfs *" */
-#define	SYS_statfs	261
+				/* 261 is compat_o43 statfs */
 
-/* syscall: "fstatfs" ret: "int" args: "int" "struct statfs *" */
-#define	SYS_fstatfs	262
+				/* 262 is compat_o43 fstatfs */
 
 /* syscall: "pipe" ret: "int" args: "int *" */
 #define	SYS_pipe	263
@@ -593,8 +590,7 @@
 
 				/* 265 is compat_35 fhstat */
 
-/* syscall: "fhstatfs" ret: "int" args: "const fhandle_t *" "struct statfs *" */
-#define	SYS_fhstatfs	266
+				/* 266 is compat_o43 fhstatfs */
 
 /* syscall: "preadv" ret: "ssize_t" args: "int" "const struct iovec *" "int" "int" "off_t" */
 #define	SYS_preadv	267
@@ -690,4 +686,16 @@
 /* syscall: "adjfreq" ret: "int" args: "const int64_t *" "int64_t *" */
 #define	SYS_adjfreq	305
 
-#define	SYS_MAXSYSCALL	306
+/* syscall: "getfsstat" ret: "int" args: "struct statfs *" "size_t" "int" */
+#define	SYS_getfsstat	306
+
+/* syscall: "statfs" ret: "int" args: "const char *" "struct statfs *" */
+#define	SYS_statfs	307
+
+/* syscall: "fstatfs" ret: "int" args: "int" "struct statfs *" */
+#define	SYS_fstatfs	308
+
+/* syscall: "fhstatfs" ret: "int" args: "const fhandle_t *" "struct statfs *" */
+#define	SYS_fhstatfs	309
+
+#define	SYS_MAXSYSCALL	310
diff --git a/sys/sys/syscallargs.h b/sys/sys/syscallargs.h
index 148ec33c2fe..616bb1bfccb 100644
--- a/sys/sys/syscallargs.h
+++ b/sys/sys/syscallargs.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: syscallargs.h,v 1.102 2008/01/05 00:38:13 miod Exp $	*/
+/*	$OpenBSD: syscallargs.h,v 1.103 2008/03/16 19:43:41 otto Exp $	*/
 
 /*
  * System call argument lists.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from;	OpenBSD: syscalls.master,v 1.89 2008/01/05 00:36:13 miod Exp 
+ * created from;	OpenBSD: syscalls.master,v 1.90 2008/03/16 19:42:57 otto Exp 
  */
 
 #ifdef	syscallarg
@@ -1045,20 +1045,20 @@ struct compat_35_sys_msgctl_args {
 	syscallarg(struct msqid_ds35 *) buf;
 };
 
-struct sys_getfsstat_args {
-	syscallarg(struct statfs *) buf;
+struct compat_o43_sys_getfsstat_args {
+	syscallarg(struct o43statfs *) buf;
 	syscallarg(size_t) bufsize;
 	syscallarg(int) flags;
 };
 
-struct sys_statfs_args {
+struct compat_o43_sys_statfs_args {
 	syscallarg(const char *) path;
-	syscallarg(struct statfs *) buf;
+	syscallarg(struct o43statfs *) buf;
 };
 
-struct sys_fstatfs_args {
+struct compat_o43_sys_fstatfs_args {
 	syscallarg(int) fd;
-	syscallarg(struct statfs *) buf;
+	syscallarg(struct o43statfs *) buf;
 };
 
 struct sys_pipe_args {
@@ -1075,9 +1075,9 @@ struct compat_35_sys_fhstat_args {
 	syscallarg(struct stat35 *) sb;
 };
 
-struct sys_fhstatfs_args {
+struct compat_o43_sys_fhstatfs_args {
 	syscallarg(const fhandle_t *) fhp;
-	syscallarg(struct statfs *) buf;
+	syscallarg(struct o43statfs *) buf;
 };
 
 struct sys_preadv_args {
@@ -1238,6 +1238,27 @@ struct sys_adjfreq_args {
 	syscallarg(int64_t *) oldfreq;
 };
 
+struct sys_getfsstat_args {
+	syscallarg(struct statfs *) buf;
+	syscallarg(size_t) bufsize;
+	syscallarg(int) flags;
+};
+
+struct sys_statfs_args {
+	syscallarg(const char *) path;
+	syscallarg(struct statfs *) buf;
+};
+
+struct sys_fstatfs_args {
+	syscallarg(int) fd;
+	syscallarg(struct statfs *) buf;
+};
+
+struct sys_fhstatfs_args {
+	syscallarg(const fhandle_t *) fhp;
+	syscallarg(struct statfs *) buf;
+};
+
 /*
  * System call prototypes.
  */
@@ -1499,13 +1520,13 @@ int	compat_35_sys_shmctl(struct proc *, void *, register_t *);
 int	compat_35_sys_msgctl(struct proc *, void *, register_t *);
 #else
 #endif
-int	sys_getfsstat(struct proc *, void *, register_t *);
-int	sys_statfs(struct proc *, void *, register_t *);
-int	sys_fstatfs(struct proc *, void *, register_t *);
+int	compat_o43_sys_getfsstat(struct proc *, void *, register_t *);
+int	compat_o43_sys_statfs(struct proc *, void *, register_t *);
+int	compat_o43_sys_fstatfs(struct proc *, void *, register_t *);
 int	sys_pipe(struct proc *, void *, register_t *);
 int	sys_fhopen(struct proc *, void *, register_t *);
 int	compat_35_sys_fhstat(struct proc *, void *, register_t *);
-int	sys_fhstatfs(struct proc *, void *, register_t *);
+int	compat_o43_sys_fhstatfs(struct proc *, void *, register_t *);
 int	sys_preadv(struct proc *, void *, register_t *);
 int	sys_pwritev(struct proc *, void *, register_t *);
 int	sys_kqueue(struct proc *, void *, register_t *);
@@ -1555,3 +1576,7 @@ int	sys_thrsigdivert(struct proc *, void *, register_t *);
 #endif
 int	sys___getcwd(struct proc *, void *, register_t *);
 int	sys_adjfreq(struct proc *, void *, register_t *);
+int	sys_getfsstat(struct proc *, void *, register_t *);
+int	sys_statfs(struct proc *, void *, register_t *);
+int	sys_fstatfs(struct proc *, void *, register_t *);
+int	sys_fhstatfs(struct proc *, void *, register_t *);