regen

3 files changed, 51 insertions, 17 deletions

diff --git a/sys/kern/syscalls.c b/sys/kern/syscalls.c
index 2ba9e20248c..59e050cd506 100644
--- a/sys/kern/syscalls.c
+++ b/sys/kern/syscalls.c
@@ -1,10 +1,10 @@
-/*	$OpenBSD: syscalls.c,v 1.76 2004/02/28 19:44:30 miod Exp $	*/
+/*	$OpenBSD: syscalls.c,v 1.77 2004/05/03 17:40:18 millert Exp $	*/
 
 /*
  * System call names.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from;	OpenBSD: syscalls.master,v 1.68 2004/02/28 19:44:16 miod Exp 
+ * created from;	OpenBSD: syscalls.master,v 1.69 2004/05/03 17:38:48 millert Exp 
  */
 
 char *syscallnames[] = {
@@ -275,7 +275,7 @@ char *syscallnames[] = {
 #ifdef SYSVSEM
 	"compat_23___osemctl",	/* 220 = compat_23 __osemctl */
 	"semget",			/* 221 = semget */
-	"semop",			/* 222 = semop */
+	"compat_35_semop",	/* 222 = compat_35 semop */
 	"#223 (obsolete sys_semconfig)",		/* 223 = obsolete sys_semconfig */
 #else
 	"#220 (unimplemented semctl)",		/* 220 = unimplemented semctl */
@@ -298,7 +298,7 @@ char *syscallnames[] = {
 	"shmat",			/* 228 = shmat */
 	"compat_23_oshmctl",	/* 229 = compat_23 oshmctl */
 	"shmdt",			/* 230 = shmdt */
-	"shmget",			/* 231 = shmget */
+	"compat_35_shmget",	/* 231 = compat_35 shmget */
 #else
 	"#228 (unimplemented shmat)",		/* 228 = unimplemented shmat */
 	"#229 (unimplemented shmctl)",		/* 229 = unimplemented shmctl */
@@ -384,4 +384,14 @@ char *syscallnames[] = {
 	"mquery",			/* 286 = mquery */
 	"closefrom",			/* 287 = closefrom */
 	"sigaltstack",			/* 288 = sigaltstack */
+#ifdef SYSVSHM
+	"shmget",			/* 289 = shmget */
+#else
+	"#289 (unimplemented shmget)",		/* 289 = unimplemented shmget */
+#endif
+#ifdef SYSVSEM
+	"semop",			/* 290 = semop */
+#else
+	"#290 (unimplemented semop)",		/* 290 = unimplemented semop */
+#endif
 };
diff --git a/sys/sys/syscall.h b/sys/sys/syscall.h
index b7b5ae587a4..82a2d5d6fa5 100644
--- a/sys/sys/syscall.h
+++ b/sys/sys/syscall.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: syscall.h,v 1.75 2004/02/28 19:44:32 miod Exp $	*/
+/*	$OpenBSD: syscall.h,v 1.76 2004/05/03 17:40:18 millert Exp $	*/
 
 /*
  * System call numbers.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from;	OpenBSD: syscalls.master,v 1.68 2004/02/28 19:44:16 miod Exp 
+ * created from;	OpenBSD: syscalls.master,v 1.69 2004/05/03 17:38:48 millert Exp 
  */
 
 /* syscall: "syscall" ret: "int" args: "int" "..." */
@@ -523,8 +523,7 @@
 /* syscall: "semget" ret: "int" args: "key_t" "int" "int" */
 #define	SYS_semget	221
 
-/* syscall: "semop" ret: "int" args: "int" "struct sembuf *" "u_int" */
-#define	SYS_semop	222
+				/* 222 is compat_35 semop */
 
 				/* 223 is obsolete sys_semconfig */
 				/* 224 is compat_23 omsgctl */
@@ -546,8 +545,7 @@
 /* syscall: "shmdt" ret: "int" args: "const void *" */
 #define	SYS_shmdt	230
 
-/* syscall: "shmget" ret: "int" args: "key_t" "int" "int" */
-#define	SYS_shmget	231
+				/* 231 is compat_35 shmget */
 
 /* syscall: "clock_gettime" ret: "int" args: "clockid_t" "struct timespec *" */
 #define	SYS_clock_gettime	232
@@ -676,4 +674,10 @@
 /* syscall: "sigaltstack" ret: "int" args: "const struct sigaltstack *" "struct sigaltstack *" */
 #define	SYS_sigaltstack	288
 
-#define	SYS_MAXSYSCALL	289
+/* syscall: "shmget" ret: "int" args: "key_t" "size_t" "int" */
+#define	SYS_shmget	289
+
+/* syscall: "semop" ret: "int" args: "int" "struct sembuf *" "size_t" */
+#define	SYS_semop	290
+
+#define	SYS_MAXSYSCALL	291
diff --git a/sys/sys/syscallargs.h b/sys/sys/syscallargs.h
index a36ae0c806b..c18f06be007 100644
--- a/sys/sys/syscallargs.h
+++ b/sys/sys/syscallargs.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: syscallargs.h,v 1.77 2004/02/28 19:44:32 miod Exp $	*/
+/*	$OpenBSD: syscallargs.h,v 1.78 2004/05/03 17:40:18 millert Exp $	*/
 
 /*
  * System call argument lists.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from;	OpenBSD: syscalls.master,v 1.68 2004/02/28 19:44:16 miod Exp 
+ * created from;	OpenBSD: syscalls.master,v 1.69 2004/05/03 17:38:48 millert Exp 
  */
 
 #ifdef	syscallarg
@@ -932,7 +932,7 @@ struct sys_semget_args {
 	syscallarg(int) semflg;
 };
 
-struct sys_semop_args {
+struct compat_35_sys_semop_args {
 	syscallarg(int) semid;
 	syscallarg(struct sembuf *) sops;
 	syscallarg(u_int) nsops;
@@ -980,7 +980,7 @@ struct sys_shmdt_args {
 	syscallarg(const void *) shmaddr;
 };
 
-struct sys_shmget_args {
+struct compat_35_sys_shmget_args {
 	syscallarg(key_t) key;
 	syscallarg(int) size;
 	syscallarg(int) shmflg;
@@ -1222,6 +1222,18 @@ struct sys_sigaltstack_args {
 	syscallarg(struct sigaltstack *) oss;
 };
 
+struct sys_shmget_args {
+	syscallarg(key_t) key;
+	syscallarg(size_t) size;
+	syscallarg(int) shmflg;
+};
+
+struct sys_semop_args {
+	syscallarg(int) semid;
+	syscallarg(struct sembuf *) sops;
+	syscallarg(size_t) nsops;
+};
+
 /*
  * System call prototypes.
  */
@@ -1443,7 +1455,7 @@ int	sys_lkmnosys(struct proc *, void *, register_t *);
 #ifdef SYSVSEM
 int	compat_23_sys___semctl(struct proc *, void *, register_t *);
 int	sys_semget(struct proc *, void *, register_t *);
-int	sys_semop(struct proc *, void *, register_t *);
+int	compat_35_sys_semop(struct proc *, void *, register_t *);
 #else
 #endif
 #ifdef SYSVMSG
@@ -1457,7 +1469,7 @@ int	sys_msgrcv(struct proc *, void *, register_t *);
 int	sys_shmat(struct proc *, void *, register_t *);
 int	compat_23_sys_shmctl(struct proc *, void *, register_t *);
 int	sys_shmdt(struct proc *, void *, register_t *);
-int	sys_shmget(struct proc *, void *, register_t *);
+int	compat_35_sys_shmget(struct proc *, void *, register_t *);
 #else
 #endif
 int	sys_clock_gettime(struct proc *, void *, register_t *);
@@ -1514,3 +1526,11 @@ int	sys_setresgid(struct proc *, void *, register_t *);
 int	sys_mquery(struct proc *, void *, register_t *);
 int	sys_closefrom(struct proc *, void *, register_t *);
 int	sys_sigaltstack(struct proc *, void *, register_t *);
+#ifdef SYSVSHM
+int	sys_shmget(struct proc *, void *, register_t *);
+#else
+#endif
+#ifdef SYSVSEM
+int	sys_semop(struct proc *, void *, register_t *);
+#else
+#endif