summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorTodd C. Miller <millert@cvs.openbsd.org>2001-05-16 21:24:02 +0000
committerTodd C. Miller <millert@cvs.openbsd.org>2001-05-16 21:24:02 +0000
commit7108246a9a0acfd1ab3b6af097833daf8fb3a61d (patch)
tree7795e1d261fb3bf38d7799c5865a62b31155eeb9 /sys
parentfc5817c0d91a998066968759cf1bfcf9ae705d98 (diff)
Missed conversion of sys___osemctl, sys_omsgctl, sys_oshmctl, to compat_23
Diffstat (limited to 'sys')
-rw-r--r--sys/compat/netbsd/netbsd_syscall.h2
-rw-r--r--sys/compat/netbsd/netbsd_syscallargs.h8
-rw-r--r--sys/compat/netbsd/netbsd_syscalls.c2
-rw-r--r--sys/compat/netbsd/netbsd_sysent.c14
-rw-r--r--sys/compat/netbsd/syscalls.master14
5 files changed, 20 insertions, 20 deletions
diff --git a/sys/compat/netbsd/netbsd_syscall.h b/sys/compat/netbsd/netbsd_syscall.h
index faefa0fd0f9..17e09d16412 100644
--- a/sys/compat/netbsd/netbsd_syscall.h
+++ b/sys/compat/netbsd/netbsd_syscall.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: netbsd_syscall.h,v 1.12 2001/05/16 17:17:06 millert Exp $ */
+/* $OpenBSD: netbsd_syscall.h,v 1.13 2001/05/16 21:24:00 millert Exp $ */
/*
* System call numbers.
diff --git a/sys/compat/netbsd/netbsd_syscallargs.h b/sys/compat/netbsd/netbsd_syscallargs.h
index be7ff91bf46..cc2640b2087 100644
--- a/sys/compat/netbsd/netbsd_syscallargs.h
+++ b/sys/compat/netbsd/netbsd_syscallargs.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: netbsd_syscallargs.h,v 1.12 2001/05/16 17:17:06 millert Exp $ */
+/* $OpenBSD: netbsd_syscallargs.h,v 1.13 2001/05/16 21:24:00 millert Exp $ */
/*
* System call argument lists.
@@ -475,13 +475,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 *));
@@ -489,7 +489,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
diff --git a/sys/compat/netbsd/netbsd_syscalls.c b/sys/compat/netbsd/netbsd_syscalls.c
index 9054c2cdf13..c777dcd6715 100644
--- a/sys/compat/netbsd/netbsd_syscalls.c
+++ b/sys/compat/netbsd/netbsd_syscalls.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: netbsd_syscalls.c,v 1.12 2001/05/16 17:17:07 millert Exp $ */
+/* $OpenBSD: netbsd_syscalls.c,v 1.13 2001/05/16 21:24:00 millert Exp $ */
/*
* System call names.
diff --git a/sys/compat/netbsd/netbsd_sysent.c b/sys/compat/netbsd/netbsd_sysent.c
index d733e3c6373..a44a7c5da97 100644
--- a/sys/compat/netbsd/netbsd_sysent.c
+++ b/sys/compat/netbsd/netbsd_sysent.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: netbsd_sysent.c,v 1.12 2001/05/16 17:17:07 millert Exp $ */
+/* $OpenBSD: netbsd_sysent.c,v 1.13 2001/05/16 21:24:01 millert Exp $ */
/*
* System call switch table.
@@ -539,8 +539,8 @@ struct sysent netbsd_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 = __osemctl */
{ 3, s(struct sys_semget_args),
sys_semget }, /* 221 = semget */
{ 3, s(struct sys_semop_args),
@@ -558,8 +558,8 @@ struct sysent netbsd_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 = omsgctl */
{ 2, s(struct sys_msgget_args),
sys_msgget }, /* 225 = msgget */
{ 4, s(struct sys_msgsnd_args),
@@ -579,8 +579,8 @@ struct sysent netbsd_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 = oshmctl */
{ 1, s(struct sys_shmdt_args),
sys_shmdt }, /* 230 = shmdt */
{ 3, s(struct sys_shmget_args),
diff --git a/sys/compat/netbsd/syscalls.master b/sys/compat/netbsd/syscalls.master
index 743b170be70..7f8b5be22d6 100644
--- a/sys/compat/netbsd/syscalls.master
+++ b/sys/compat/netbsd/syscalls.master
@@ -1,4 +1,4 @@
-; $OpenBSD: syscalls.master,v 1.12 2001/05/16 17:14:38 millert Exp $
+; $OpenBSD: syscalls.master,v 1.13 2001/05/16 21:24:01 millert Exp $
; @(#)syscalls.master 8.2 (Berkeley) 1/13/94
@@ -452,8 +452,8 @@
#endif /* !LKM */
; System calls 220-240 are reserved for use by OpenBSD
#ifdef SYSVSEM
-220 NOARGS { int sys___osemctl(int semid, int semnum, int cmd, \
- union semun *arg); }
+220 NOARGS { int compat_23_sys___semctl(int semid, int semnum, \
+ int cmd, union semun *arg); } __osemctl
221 NOARGS { int sys_semget(key_t key, int nsems, int semflg); }
222 NOARGS { int sys_semop(int semid, struct sembuf *sops, \
u_int nsops); }
@@ -465,8 +465,8 @@
223 UNIMPL semconfig
#endif
#ifdef SYSVMSG
-224 NOARGS { int sys_omsgctl(int msqid, int cmd, \
- struct omsqid_ds *buf); }
+224 NOARGS { int compat_23_sys_msgctl(int msqid, int cmd, \
+ struct omsqid_ds *buf); } omsgctl
225 NOARGS { int sys_msgget(key_t key, int msgflg); }
226 NOARGS { int sys_msgsnd(int msqid, const void *msgp, \
size_t msgsz, int msgflg); }
@@ -481,8 +481,8 @@
#ifdef SYSVSHM
228 NOARGS { void *sys_shmat(int shmid, const void *shmaddr, \
int shmflg); }
-229 NOARGS { int sys_oshmctl(int shmid, int cmd, \
- struct oshmid_ds *buf); }
+229 NOARGS { int compat_23_sys_shmctl(int shmid, int cmd, \
+ struct oshmid_ds *buf); } oshmctl
230 NOARGS { int sys_shmdt(const void *shmaddr); }
231 NOARGS { int sys_shmget(key_t key, int size, int shmflg); }
#else