diff options
-rw-r--r-- | sys/kern/init_sysent.c | 22 | ||||
-rw-r--r-- | sys/kern/syscalls.c | 13 | ||||
-rw-r--r-- | sys/sys/syscall.h | 27 | ||||
-rw-r--r-- | sys/sys/syscallargs.h | 42 |
4 files changed, 72 insertions, 32 deletions
diff --git a/sys/kern/init_sysent.c b/sys/kern/init_sysent.c index 4673d93f1e0..79c00dfd4b5 100644 --- a/sys/kern/init_sysent.c +++ b/sys/kern/init_sysent.c @@ -1,10 +1,10 @@ -/* $OpenBSD: init_sysent.c,v 1.28 1998/06/02 05:23:10 deraadt Exp $ */ +/* $OpenBSD: init_sysent.c,v 1.29 1998/06/11 18:31:21 deraadt Exp $ */ /* * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * created from; OpenBSD: syscalls.master,v 1.26 1998/06/02 05:22:29 deraadt Exp + * created from; OpenBSD: syscalls.master,v 1.27 1998/06/11 18:29:53 deraadt Exp */ #include <sys/param.h> @@ -558,8 +558,8 @@ struct sysent sysent[] = { sys_nosys }, /* 219 = unimplemented */ #endif /* !LKM */ #ifdef SYSVSEM - { 4, s(struct sys___semctl_args), - sys___semctl }, /* 220 = __semctl */ + { 4, s(struct sys___osemctl_args), + sys___osemctl }, /* 220 = __osemctl */ { 3, s(struct sys_semget_args), sys_semget }, /* 221 = semget */ { 3, s(struct sys_semop_args), @@ -577,8 +577,8 @@ struct sysent sysent[] = { sys_nosys }, /* 223 = unimplemented semconfig */ #endif #ifdef SYSVMSG - { 3, s(struct sys_msgctl_args), - sys_msgctl }, /* 224 = msgctl */ + { 3, s(struct sys_omsgctl_args), + sys_omsgctl }, /* 224 = omsgctl */ { 2, s(struct sys_msgget_args), sys_msgget }, /* 225 = msgget */ { 4, s(struct sys_msgsnd_args), @@ -598,8 +598,8 @@ struct sysent sysent[] = { #ifdef SYSVSHM { 3, s(struct sys_shmat_args), sys_shmat }, /* 228 = shmat */ - { 3, s(struct sys_shmctl_args), - sys_shmctl }, /* 229 = shmctl */ + { 3, s(struct sys_oshmctl_args), + sys_oshmctl }, /* 229 = oshmctl */ { 1, s(struct sys_shmdt_args), sys_shmdt }, /* 230 = shmdt */ { 3, s(struct sys_shmget_args), @@ -664,5 +664,11 @@ struct sysent sysent[] = { sys_getsid }, /* 255 = getsid */ { 3, s(struct sys_msync_args), sys_msync }, /* 256 = msync */ + { 4, s(struct sys___semctl_args), + sys___semctl }, /* 257 = __semctl */ + { 3, s(struct sys_shmctl_args), + sys_shmctl }, /* 258 = shmctl */ + { 3, s(struct sys_msgctl_args), + sys_msgctl }, /* 259 = msgctl */ }; diff --git a/sys/kern/syscalls.c b/sys/kern/syscalls.c index 4e46afd3b96..41c268eba2e 100644 --- a/sys/kern/syscalls.c +++ b/sys/kern/syscalls.c @@ -1,10 +1,10 @@ -/* $OpenBSD: syscalls.c,v 1.28 1998/06/02 05:23:12 deraadt Exp $ */ +/* $OpenBSD: syscalls.c,v 1.29 1998/06/11 18:31:22 deraadt Exp $ */ /* * System call names. * * DO NOT EDIT-- this file is automatically generated. - * created from; OpenBSD: syscalls.master,v 1.26 1998/06/02 05:22:29 deraadt Exp + * created from; OpenBSD: syscalls.master,v 1.27 1998/06/11 18:29:53 deraadt Exp */ char *syscallnames[] = { @@ -282,7 +282,7 @@ char *syscallnames[] = { "#219 (unimplemented)", /* 219 = unimplemented */ #endif /* !LKM */ #ifdef SYSVSEM - "__semctl", /* 220 = __semctl */ + "__osemctl", /* 220 = __osemctl */ "semget", /* 221 = semget */ "semop", /* 222 = semop */ "semconfig", /* 223 = semconfig */ @@ -293,7 +293,7 @@ char *syscallnames[] = { "#223 (unimplemented semconfig)", /* 223 = unimplemented semconfig */ #endif #ifdef SYSVMSG - "msgctl", /* 224 = msgctl */ + "omsgctl", /* 224 = omsgctl */ "msgget", /* 225 = msgget */ "msgsnd", /* 226 = msgsnd */ "msgrcv", /* 227 = msgrcv */ @@ -305,7 +305,7 @@ char *syscallnames[] = { #endif #ifdef SYSVSHM "shmat", /* 228 = shmat */ - "shmctl", /* 229 = shmctl */ + "oshmctl", /* 229 = oshmctl */ "shmdt", /* 230 = shmdt */ "shmget", /* 231 = shmget */ #else @@ -339,4 +339,7 @@ char *syscallnames[] = { "lchown", /* 254 = lchown */ "getsid", /* 255 = getsid */ "msync", /* 256 = msync */ + "__semctl", /* 257 = __semctl */ + "shmctl", /* 258 = shmctl */ + "msgctl", /* 259 = msgctl */ }; diff --git a/sys/sys/syscall.h b/sys/sys/syscall.h index 4adf61949f5..e822d3b62ab 100644 --- a/sys/sys/syscall.h +++ b/sys/sys/syscall.h @@ -1,10 +1,10 @@ -/* $OpenBSD: syscall.h,v 1.28 1998/06/02 05:23:13 deraadt Exp $ */ +/* $OpenBSD: syscall.h,v 1.29 1998/06/11 18:31:17 deraadt Exp $ */ /* * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * created from; OpenBSD: syscalls.master,v 1.26 1998/06/02 05:22:29 deraadt Exp + * created from; OpenBSD: syscalls.master,v 1.27 1998/06/11 18:29:53 deraadt Exp */ /* syscall: "syscall" ret: "int" args: "int" "..." */ @@ -518,8 +518,8 @@ /* syscall: "getpgid" ret: "int" args: "pid_t" */ #define SYS_getpgid 207 -/* syscall: "__semctl" ret: "int" args: "int" "int" "int" "union semun *" */ -#define SYS___semctl 220 +/* syscall: "__osemctl" ret: "int" args: "int" "int" "int" "union semun *" */ +#define SYS___osemctl 220 /* syscall: "semget" ret: "int" args: "key_t" "int" "int" */ #define SYS_semget 221 @@ -530,8 +530,8 @@ /* syscall: "semconfig" ret: "int" args: "int" */ #define SYS_semconfig 223 -/* syscall: "msgctl" ret: "int" args: "int" "int" "struct msqid_ds *" */ -#define SYS_msgctl 224 +/* syscall: "omsgctl" ret: "int" args: "int" "int" "struct omsqid_ds *" */ +#define SYS_omsgctl 224 /* syscall: "msgget" ret: "int" args: "key_t" "int" */ #define SYS_msgget 225 @@ -545,8 +545,8 @@ /* syscall: "shmat" ret: "void *" args: "int" "const void *" "int" */ #define SYS_shmat 228 -/* syscall: "shmctl" ret: "int" args: "int" "int" "struct shmid_ds *" */ -#define SYS_shmctl 229 +/* syscall: "oshmctl" ret: "int" args: "int" "int" "struct oshmid_ds *" */ +#define SYS_oshmctl 229 /* syscall: "shmdt" ret: "int" args: "const void *" */ #define SYS_shmdt 230 @@ -587,4 +587,13 @@ /* syscall: "msync" ret: "int" args: "void *" "size_t" "int" */ #define SYS_msync 256 -#define SYS_MAXSYSCALL 257 +/* syscall: "__semctl" ret: "int" args: "int" "int" "int" "union semun *" */ +#define SYS___semctl 257 + +/* syscall: "shmctl" ret: "int" args: "int" "int" "struct shmid_ds *" */ +#define SYS_shmctl 258 + +/* syscall: "msgctl" ret: "int" args: "int" "int" "struct msqid_ds *" */ +#define SYS_msgctl 259 + +#define SYS_MAXSYSCALL 260 diff --git a/sys/sys/syscallargs.h b/sys/sys/syscallargs.h index ead6bec31e4..b793b6daa67 100644 --- a/sys/sys/syscallargs.h +++ b/sys/sys/syscallargs.h @@ -1,10 +1,10 @@ -/* $OpenBSD: syscallargs.h,v 1.29 1998/06/02 05:23:14 deraadt Exp $ */ +/* $OpenBSD: syscallargs.h,v 1.30 1998/06/11 18:31:19 deraadt Exp $ */ /* * System call argument lists. * * DO NOT EDIT-- this file is automatically generated. - * created from; OpenBSD: syscalls.master,v 1.26 1998/06/02 05:22:29 deraadt Exp + * created from; OpenBSD: syscalls.master,v 1.27 1998/06/11 18:29:53 deraadt Exp */ #define syscallarg(x) union { x datum; register_t pad; } @@ -888,7 +888,7 @@ struct sys_getpgid_args { syscallarg(pid_t) pid; }; -struct sys___semctl_args { +struct sys___osemctl_args { syscallarg(int) semid; syscallarg(int) semnum; syscallarg(int) cmd; @@ -911,10 +911,10 @@ struct sys_semconfig_args { syscallarg(int) flag; }; -struct sys_msgctl_args { +struct sys_omsgctl_args { syscallarg(int) msqid; syscallarg(int) cmd; - syscallarg(struct msqid_ds *) buf; + syscallarg(struct omsqid_ds *) buf; }; struct sys_msgget_args { @@ -943,10 +943,10 @@ struct sys_shmat_args { syscallarg(int) shmflg; }; -struct sys_shmctl_args { +struct sys_oshmctl_args { syscallarg(int) shmid; syscallarg(int) cmd; - syscallarg(struct shmid_ds *) buf; + syscallarg(struct oshmid_ds *) buf; }; struct sys_shmdt_args { @@ -1011,6 +1011,25 @@ struct sys_msync_args { syscallarg(int) flags; }; +struct sys___semctl_args { + syscallarg(int) semid; + syscallarg(int) semnum; + syscallarg(int) cmd; + syscallarg(union semun *) arg; +}; + +struct sys_shmctl_args { + syscallarg(int) shmid; + syscallarg(int) cmd; + syscallarg(struct shmid_ds *) buf; +}; + +struct sys_msgctl_args { + syscallarg(int) msqid; + syscallarg(int) cmd; + syscallarg(struct msqid_ds *) buf; +}; + /* * System call prototypes. */ @@ -1235,14 +1254,14 @@ int sys_lkmnosys __P((struct proc *, void *, register_t *)); #else /* !LKM */ #endif /* !LKM */ #ifdef SYSVSEM -int sys___semctl __P((struct proc *, void *, register_t *)); +int sys___osemctl __P((struct proc *, void *, register_t *)); int sys_semget __P((struct proc *, void *, register_t *)); int sys_semop __P((struct proc *, void *, register_t *)); int sys_semconfig __P((struct proc *, void *, register_t *)); #else #endif #ifdef SYSVMSG -int sys_msgctl __P((struct proc *, void *, register_t *)); +int sys_omsgctl __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 *)); @@ -1250,7 +1269,7 @@ int sys_msgrcv __P((struct proc *, void *, register_t *)); #endif #ifdef SYSVSHM int sys_shmat __P((struct proc *, void *, register_t *)); -int sys_shmctl __P((struct proc *, void *, register_t *)); +int sys_oshmctl __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 @@ -1266,3 +1285,6 @@ int sys_issetugid __P((struct proc *, void *, register_t *)); int sys_lchown __P((struct proc *, void *, register_t *)); int sys_getsid __P((struct proc *, void *, register_t *)); int sys_msync __P((struct proc *, void *, register_t *)); +int sys___semctl __P((struct proc *, void *, register_t *)); +int sys_shmctl __P((struct proc *, void *, register_t *)); +int sys_msgctl __P((struct proc *, void *, register_t *)); |