diff options
Diffstat (limited to 'sys')
-rw-r--r-- | sys/kern/init_sysent.c | 37 | ||||
-rw-r--r-- | sys/kern/syscalls.c | 25 | ||||
-rw-r--r-- | sys/sys/syscall.h | 24 | ||||
-rw-r--r-- | sys/sys/syscallargs.h | 51 |
4 files changed, 105 insertions, 32 deletions
diff --git a/sys/kern/init_sysent.c b/sys/kern/init_sysent.c index b4c8a67d1a7..cbc414cdd24 100644 --- a/sys/kern/init_sysent.c +++ b/sys/kern/init_sysent.c @@ -1,10 +1,10 @@ -/* $OpenBSD: init_sysent.c,v 1.82 2004/07/14 18:01:29 millert Exp $ */ +/* $OpenBSD: init_sysent.c,v 1.83 2004/07/14 23:45:59 millert Exp $ */ /* * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * created from; OpenBSD: syscalls.master,v 1.73 2004/07/14 18:00:48 millert Exp + * created from; OpenBSD: syscalls.master,v 1.74 2004/07/14 23:45:11 millert Exp */ #include <sys/param.h> @@ -672,22 +672,22 @@ struct sysent sysent[] = { { 3, s(struct sys_msync_args), sys_msync }, /* 256 = msync */ #ifdef SYSVSEM - { 4, s(struct sys___semctl_args), - sys___semctl }, /* 257 = __semctl */ + { 4, s(struct compat_35_sys___semctl_args), + compat_35(sys___semctl) }, /* 257 = compat_35 semctl35 */ #else { 0, 0, sys_nosys }, /* 257 = unimplemented */ #endif #ifdef SYSVSHM - { 3, s(struct sys_shmctl_args), - sys_shmctl }, /* 258 = shmctl */ + { 3, s(struct compat_35_sys_shmctl_args), + compat_35(sys_shmctl) }, /* 258 = compat_35 shmctl35 */ #else { 0, 0, sys_nosys }, /* 258 = unimplemented */ #endif #ifdef SYSVMSG - { 3, s(struct sys_msgctl_args), - sys_msgctl }, /* 259 = msgctl */ + { 3, s(struct compat_35_sys_msgctl_args), + compat_35(sys_msgctl) }, /* 259 = compat_35 msgctl35 */ #else { 0, 0, sys_nosys }, /* 259 = unimplemented */ @@ -789,5 +789,26 @@ struct sysent sysent[] = { sys_lstat }, /* 293 = lstat */ { 2, s(struct sys_fhstat_args), sys_fhstat }, /* 294 = fhstat */ +#ifdef SYSVSEM + { 4, s(struct sys___semctl_args), + sys___semctl }, /* 295 = __semctl */ +#else + { 0, 0, + sys_nosys }, /* 295 = unimplemented */ +#endif +#ifdef SYSVSHM + { 3, s(struct sys_shmctl_args), + sys_shmctl }, /* 296 = shmctl */ +#else + { 0, 0, + sys_nosys }, /* 296 = unimplemented */ +#endif +#ifdef SYSVMSG + { 3, s(struct sys_msgctl_args), + sys_msgctl }, /* 297 = msgctl */ +#else + { 0, 0, + sys_nosys }, /* 297 = unimplemented */ +#endif }; diff --git a/sys/kern/syscalls.c b/sys/kern/syscalls.c index 9954f238985..f107179a839 100644 --- a/sys/kern/syscalls.c +++ b/sys/kern/syscalls.c @@ -1,10 +1,10 @@ -/* $OpenBSD: syscalls.c,v 1.83 2004/07/14 18:01:29 millert Exp $ */ +/* $OpenBSD: syscalls.c,v 1.84 2004/07/14 23:45:59 millert Exp $ */ /* * System call names. * * DO NOT EDIT-- this file is automatically generated. - * created from; OpenBSD: syscalls.master,v 1.73 2004/07/14 18:00:48 millert Exp + * created from; OpenBSD: syscalls.master,v 1.74 2004/07/14 23:45:11 millert Exp */ char *syscallnames[] = { @@ -335,17 +335,17 @@ char *syscallnames[] = { "getsid", /* 255 = getsid */ "msync", /* 256 = msync */ #ifdef SYSVSEM - "__semctl", /* 257 = __semctl */ + "compat_35_semctl35", /* 257 = compat_35 semctl35 */ #else "#257 (unimplemented)", /* 257 = unimplemented */ #endif #ifdef SYSVSHM - "shmctl", /* 258 = shmctl */ + "compat_35_shmctl35", /* 258 = compat_35 shmctl35 */ #else "#258 (unimplemented)", /* 258 = unimplemented */ #endif #ifdef SYSVMSG - "msgctl", /* 259 = msgctl */ + "compat_35_msgctl35", /* 259 = compat_35 msgctl35 */ #else "#259 (unimplemented)", /* 259 = unimplemented */ #endif @@ -402,4 +402,19 @@ char *syscallnames[] = { "fstat", /* 292 = fstat */ "lstat", /* 293 = lstat */ "fhstat", /* 294 = fhstat */ +#ifdef SYSVSEM + "__semctl", /* 295 = __semctl */ +#else + "#295 (unimplemented)", /* 295 = unimplemented */ +#endif +#ifdef SYSVSHM + "shmctl", /* 296 = shmctl */ +#else + "#296 (unimplemented)", /* 296 = unimplemented */ +#endif +#ifdef SYSVMSG + "msgctl", /* 297 = msgctl */ +#else + "#297 (unimplemented)", /* 297 = unimplemented */ +#endif }; diff --git a/sys/sys/syscall.h b/sys/sys/syscall.h index 49dc3bdb75b..5523ee095d3 100644 --- a/sys/sys/syscall.h +++ b/sys/sys/syscall.h @@ -1,10 +1,10 @@ -/* $OpenBSD: syscall.h,v 1.81 2004/07/14 18:01:29 millert Exp $ */ +/* $OpenBSD: syscall.h,v 1.82 2004/07/14 23:45:59 millert Exp $ */ /* * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * created from; OpenBSD: syscalls.master,v 1.73 2004/07/14 18:00:48 millert Exp + * created from; OpenBSD: syscalls.master,v 1.74 2004/07/14 23:45:11 millert Exp */ /* syscall: "syscall" ret: "int" args: "int" "..." */ @@ -577,14 +577,11 @@ /* syscall: "msync" ret: "int" args: "void *" "size_t" "int" */ #define SYS_msync 256 -/* syscall: "__semctl" ret: "int" args: "int" "int" "int" "union semun *" */ -#define SYS___semctl 257 + /* 257 is compat_35 semctl35 */ -/* syscall: "shmctl" ret: "int" args: "int" "int" "struct shmid_ds *" */ -#define SYS_shmctl 258 + /* 258 is compat_35 shmctl35 */ -/* syscall: "msgctl" ret: "int" args: "int" "int" "struct msqid_ds *" */ -#define SYS_msgctl 259 + /* 259 is compat_35 msgctl35 */ /* syscall: "getfsstat" ret: "int" args: "struct statfs *" "size_t" "int" */ #define SYS_getfsstat 260 @@ -688,4 +685,13 @@ /* syscall: "fhstat" ret: "int" args: "const fhandle_t *" "struct stat *" */ #define SYS_fhstat 294 -#define SYS_MAXSYSCALL 295 +/* syscall: "__semctl" ret: "int" args: "int" "int" "int" "union semun *" */ +#define SYS___semctl 295 + +/* syscall: "shmctl" ret: "int" args: "int" "int" "struct shmid_ds *" */ +#define SYS_shmctl 296 + +/* syscall: "msgctl" ret: "int" args: "int" "int" "struct msqid_ds *" */ +#define SYS_msgctl 297 + +#define SYS_MAXSYSCALL 298 diff --git a/sys/sys/syscallargs.h b/sys/sys/syscallargs.h index 084f50f68c8..d2b7bd02f99 100644 --- a/sys/sys/syscallargs.h +++ b/sys/sys/syscallargs.h @@ -1,10 +1,10 @@ -/* $OpenBSD: syscallargs.h,v 1.83 2004/07/14 18:01:29 millert Exp $ */ +/* $OpenBSD: syscallargs.h,v 1.84 2004/07/14 23:45:59 millert Exp $ */ /* * System call argument lists. * * DO NOT EDIT-- this file is automatically generated. - * created from; OpenBSD: syscalls.master,v 1.73 2004/07/14 18:00:48 millert Exp + * created from; OpenBSD: syscalls.master,v 1.74 2004/07/14 23:45:11 millert Exp */ #ifdef syscallarg @@ -1038,23 +1038,23 @@ struct sys_msync_args { syscallarg(int) flags; }; -struct sys___semctl_args { +struct compat_35_sys___semctl_args { syscallarg(int) semid; syscallarg(int) semnum; syscallarg(int) cmd; syscallarg(union semun *) arg; }; -struct sys_shmctl_args { +struct compat_35_sys_shmctl_args { syscallarg(int) shmid; syscallarg(int) cmd; - syscallarg(struct shmid_ds *) buf; + syscallarg(struct shmid_ds35 *) buf; }; -struct sys_msgctl_args { +struct compat_35_sys_msgctl_args { syscallarg(int) msqid; syscallarg(int) cmd; - syscallarg(struct msqid_ds *) buf; + syscallarg(struct msqid_ds35 *) buf; }; struct sys_getfsstat_args { @@ -1254,6 +1254,25 @@ struct sys_fhstat_args { syscallarg(struct stat *) sb; }; +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. */ @@ -1507,15 +1526,15 @@ int sys_lchown(struct proc *, void *, register_t *); int sys_getsid(struct proc *, void *, register_t *); int sys_msync(struct proc *, void *, register_t *); #ifdef SYSVSEM -int sys___semctl(struct proc *, void *, register_t *); +int compat_35_sys___semctl(struct proc *, void *, register_t *); #else #endif #ifdef SYSVSHM -int sys_shmctl(struct proc *, void *, register_t *); +int compat_35_sys_shmctl(struct proc *, void *, register_t *); #else #endif #ifdef SYSVMSG -int sys_msgctl(struct proc *, void *, register_t *); +int compat_35_sys_msgctl(struct proc *, void *, register_t *); #else #endif int sys_getfsstat(struct proc *, void *, register_t *); @@ -1561,3 +1580,15 @@ int sys_stat(struct proc *, void *, register_t *); int sys_fstat(struct proc *, void *, register_t *); int sys_lstat(struct proc *, void *, register_t *); int sys_fhstat(struct proc *, void *, register_t *); +#ifdef SYSVSEM +int sys___semctl(struct proc *, void *, register_t *); +#else +#endif +#ifdef SYSVSHM +int sys_shmctl(struct proc *, void *, register_t *); +#else +#endif +#ifdef SYSVMSG +int sys_msgctl(struct proc *, void *, register_t *); +#else +#endif |