summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>1998-06-11 18:29:54 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>1998-06-11 18:29:54 +0000
commitf9cbb4981c7b30996c2efe3f40d0895f064a3ab5 (patch)
tree9481fdef5c3c432c831a8c7f0b170eaedc6eaade
parenta2498a80cab745c7b6b8954c93f1c0dae2f85689 (diff)
move shm/msg/sem calls because ipc.h is getting uid_t and friends
-rw-r--r--sys/kern/syscalls.master18
1 files changed, 12 insertions, 6 deletions
diff --git a/sys/kern/syscalls.master b/sys/kern/syscalls.master
index 4edb89ed7a5..5e2a3e63fdb 100644
--- a/sys/kern/syscalls.master
+++ b/sys/kern/syscalls.master
@@ -1,4 +1,4 @@
-; $OpenBSD: syscalls.master,v 1.26 1998/06/02 05:22:29 deraadt Exp $
+; $OpenBSD: syscalls.master,v 1.27 1998/06/11 18:29:53 deraadt Exp $
; $NetBSD: syscalls.master,v 1.32 1996/04/23 10:24:21 mycroft Exp $
; @(#)syscalls.master 8.2 (Berkeley) 1/13/94
@@ -421,7 +421,7 @@
#endif /* !LKM */
; System calls 220-240 are reserved for use by NetBSD
#ifdef SYSVSEM
-220 STD { int sys___semctl(int semid, int semnum, int cmd, \
+220 STD { int sys___osemctl(int semid, int semnum, int cmd, \
union semun *arg); }
221 STD { int sys_semget(key_t key, int nsems, int semflg); }
222 STD { int sys_semop(int semid, struct sembuf *sops, \
@@ -434,8 +434,8 @@
223 UNIMPL semconfig
#endif
#ifdef SYSVMSG
-224 STD { int sys_msgctl(int msqid, int cmd, \
- struct msqid_ds *buf); }
+224 STD { int sys_omsgctl(int msqid, int cmd, \
+ struct omsqid_ds *buf); }
225 STD { int sys_msgget(key_t key, int msgflg); }
226 STD { int sys_msgsnd(int msqid, const void *msgp, size_t msgsz, \
int msgflg); }
@@ -450,8 +450,8 @@
#ifdef SYSVSHM
228 STD { void *sys_shmat(int shmid, const void *shmaddr, \
int shmflg); }
-229 STD { int sys_shmctl(int shmid, int cmd, \
- struct shmid_ds *buf); }
+229 STD { int sys_oshmctl(int shmid, int cmd, \
+ struct oshmid_ds *buf); }
230 STD { int sys_shmdt(const void *shmaddr); }
231 STD { int sys_shmget(key_t key, int size, int shmflg); }
#else
@@ -491,3 +491,9 @@
254 STD { int sys_lchown(const char *path, uid_t uid, gid_t gid); }
255 STD { int sys_getsid(pid_t pid); }
256 STD { int sys_msync(void *addr, size_t len, int flags); }
+257 STD { int sys___semctl(int semid, int semnum, int cmd, \
+ union semun *arg); }
+258 STD { int sys_shmctl(int shmid, int cmd, \
+ struct shmid_ds *buf); }
+259 STD { int sys_msgctl(int msqid, int cmd, \
+ struct msqid_ds *buf); }