mquery backout sync.

4 files changed, 15 insertions, 32 deletions

diff --git a/sys/kern/init_sysent.c b/sys/kern/init_sysent.c
index 7d28a7ed089..215842aa8c5 100644
--- a/sys/kern/init_sysent.c
+++ b/sys/kern/init_sysent.c
@@ -1,10 +1,10 @@
-/*	$OpenBSD: init_sysent.c,v 1.62 2003/04/25 18:40:46 drahn Exp $	*/
+/*	$OpenBSD: init_sysent.c,v 1.63 2003/04/25 20:34:22 drahn Exp $	*/
 
 /*
  * System call switch table.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from;	OpenBSD: syscalls.master,v 1.54 2003/04/25 18:30:18 drahn Exp 
+ * created from;	OpenBSD: syscalls.master,v 1.55 2003/04/25 20:32:07 drahn Exp 
  */
 
 #include <sys/param.h>
@@ -746,9 +746,7 @@ struct sysent sysent[] = {
 	    sys_getresgid },			/* 283 = getresgid */
 	{ 3, s(struct sys_setresgid_args),
 	    sys_setresgid },			/* 284 = setresgid */
-	{ 5, s(struct sys_omquery_args),
-	    sys_omquery },			/* 285 = omquery */
-	{ 7, s(struct sys_mquery_args),
-	    sys_mquery },			/* 286 = mquery */
+	{ 5, s(struct sys_mquery_args),
+	    sys_mquery },			/* 285 = mquery */
 };
 
diff --git a/sys/kern/syscalls.c b/sys/kern/syscalls.c
index 6b6604ee929..44417b1081c 100644
--- a/sys/kern/syscalls.c
+++ b/sys/kern/syscalls.c
@@ -1,10 +1,10 @@
-/*	$OpenBSD: syscalls.c,v 1.62 2003/04/25 18:40:46 drahn Exp $	*/
+/*	$OpenBSD: syscalls.c,v 1.63 2003/04/25 20:34:22 drahn Exp $	*/
 
 /*
  * System call names.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from;	OpenBSD: syscalls.master,v 1.54 2003/04/25 18:30:18 drahn Exp 
+ * created from;	OpenBSD: syscalls.master,v 1.55 2003/04/25 20:32:07 drahn Exp 
  */
 
 char *syscallnames[] = {
@@ -380,6 +380,5 @@ char *syscallnames[] = {
 	"setresuid",			/* 282 = setresuid */
 	"getresgid",			/* 283 = getresgid */
 	"setresgid",			/* 284 = setresgid */
-	"omquery",			/* 285 = omquery */
-	"mquery",			/* 286 = mquery */
+	"mquery",			/* 285 = mquery */
 };
diff --git a/sys/sys/syscall.h b/sys/sys/syscall.h
index 287e29b8904..2ebcd9b911d 100644
--- a/sys/sys/syscall.h
+++ b/sys/sys/syscall.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: syscall.h,v 1.61 2003/04/25 18:40:46 drahn Exp $	*/
+/*	$OpenBSD: syscall.h,v 1.62 2003/04/25 20:34:22 drahn Exp $	*/
 
 /*
  * System call numbers.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from;	OpenBSD: syscalls.master,v 1.54 2003/04/25 18:30:18 drahn Exp 
+ * created from;	OpenBSD: syscalls.master,v 1.55 2003/04/25 20:32:07 drahn Exp 
  */
 
 /* syscall: "syscall" ret: "int" args: "int" "..." */
@@ -668,10 +668,7 @@
 /* syscall: "setresgid" ret: "int" args: "gid_t" "gid_t" "gid_t" */
 #define	SYS_setresgid	284
 
-/* syscall: "omquery" ret: "int" args: "int" "void **" "size_t" "int" "off_t" */
-#define	SYS_omquery	285
+/* syscall: "mquery" ret: "int" args: "int" "void **" "size_t" "int" "off_t" */
+#define	SYS_mquery	285
 
-/* syscall: "mquery" ret: "void *" args: "void *" "size_t" "int" "int" "int" "long" "off_t" */
-#define	SYS_mquery	286
-
-#define	SYS_MAXSYSCALL	287
+#define	SYS_MAXSYSCALL	286
diff --git a/sys/sys/syscallargs.h b/sys/sys/syscallargs.h
index fa3dbebf657..7c8c3b5a584 100644
--- a/sys/sys/syscallargs.h
+++ b/sys/sys/syscallargs.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: syscallargs.h,v 1.63 2003/04/25 18:40:46 drahn Exp $	*/
+/*	$OpenBSD: syscallargs.h,v 1.64 2003/04/25 20:34:22 drahn Exp $	*/
 
 /*
  * System call argument lists.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from;	OpenBSD: syscalls.master,v 1.54 2003/04/25 18:30:18 drahn Exp 
+ * created from;	OpenBSD: syscalls.master,v 1.55 2003/04/25 20:32:07 drahn Exp 
  */
 
 #ifdef	syscallarg
@@ -1203,7 +1203,7 @@ struct sys_setresgid_args {
 	syscallarg(gid_t) sgid;
 };
 
-struct sys_omquery_args {
+struct sys_mquery_args {
 	syscallarg(int) flags;
 	syscallarg(void **) addr;
 	syscallarg(size_t) size;
@@ -1211,16 +1211,6 @@ struct sys_omquery_args {
 	syscallarg(off_t) off;
 };
 
-struct sys_mquery_args {
-	syscallarg(void *) addr;
-	syscallarg(size_t) len;
-	syscallarg(int) prot;
-	syscallarg(int) flags;
-	syscallarg(int) fd;
-	syscallarg(long) pad;
-	syscallarg(off_t) pos;
-};
-
 /*
  * System call prototypes.
  */
@@ -1510,5 +1500,4 @@ int	sys_getresuid(struct proc *, void *, register_t *);
 int	sys_setresuid(struct proc *, void *, register_t *);
 int	sys_getresgid(struct proc *, void *, register_t *);
 int	sys_setresgid(struct proc *, void *, register_t *);
-int	sys_omquery(struct proc *, void *, register_t *);
 int	sys_mquery(struct proc *, void *, register_t *);