From e959a3fdd8d7f5ddc058a8d1ba703af5b2722fda Mon Sep 17 00:00:00 2001 From: Theo de Raadt Date: Tue, 31 May 2016 22:10:35 +0000 Subject: sync --- sys/kern/init_sysent.c | 12 ++++++------ sys/kern/syscalls.c | 8 ++++---- sys/sys/syscall.h | 12 ++++-------- sys/sys/syscallargs.h | 16 ++-------------- 4 files changed, 16 insertions(+), 32 deletions(-) diff --git a/sys/kern/init_sysent.c b/sys/kern/init_sysent.c index 42fed420c6a..856c9ed1245 100644 --- a/sys/kern/init_sysent.c +++ b/sys/kern/init_sysent.c @@ -1,10 +1,10 @@ -/* $OpenBSD: init_sysent.c,v 1.182 2016/03/30 07:49:45 guenther Exp $ */ +/* $OpenBSD: init_sysent.c,v 1.183 2016/05/31 22:10:34 deraadt Exp $ */ /* * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * created from; OpenBSD: syscalls.master,v 1.169 2016/03/30 07:49:11 guenther Exp + * created from; OpenBSD: syscalls.master,v 1.172 2016/05/31 22:08:53 deraadt Exp */ #include @@ -96,8 +96,8 @@ struct sysent sysent[] = { sys_fchflags }, /* 35 = fchflags */ { 0, 0, 0, sys_sync }, /* 36 = sync */ - { 2, s(struct sys_o58_kill_args), 0, - sys_o58_kill }, /* 37 = o58_kill */ + { 0, 0, 0, + sys_nosys }, /* 37 = obsolete o58_kill */ { 2, s(struct sys_stat_args), 0, sys_stat }, /* 38 = stat */ { 0, 0, 0, @@ -198,8 +198,8 @@ struct sysent sysent[] = { sys_getpgrp }, /* 81 = getpgrp */ { 2, s(struct sys_setpgid_args), 0, sys_setpgid }, /* 82 = setpgid */ - { 2, s(struct sys_osendsyslog_args), 0, - sys_osendsyslog }, /* 83 = osendsyslog */ + { 0, 0, 0, + sys_nosys }, /* 83 = obsolete osendsyslog */ { 4, s(struct sys_utimensat_args), 0, sys_utimensat }, /* 84 = utimensat */ { 2, s(struct sys_futimens_args), 0, diff --git a/sys/kern/syscalls.c b/sys/kern/syscalls.c index c8f4595ade9..03d13396125 100644 --- a/sys/kern/syscalls.c +++ b/sys/kern/syscalls.c @@ -1,10 +1,10 @@ -/* $OpenBSD: syscalls.c,v 1.181 2016/03/30 07:49:45 guenther Exp $ */ +/* $OpenBSD: syscalls.c,v 1.182 2016/05/31 22:10:34 deraadt Exp $ */ /* * System call names. * * DO NOT EDIT-- this file is automatically generated. - * created from; OpenBSD: syscalls.master,v 1.169 2016/03/30 07:49:11 guenther Exp + * created from; OpenBSD: syscalls.master,v 1.172 2016/05/31 22:08:53 deraadt Exp */ char *syscallnames[] = { @@ -49,7 +49,7 @@ char *syscallnames[] = { "chflags", /* 34 = chflags */ "fchflags", /* 35 = fchflags */ "sync", /* 36 = sync */ - "o58_kill", /* 37 = o58_kill */ + "#37 (obsolete o58_kill)", /* 37 = obsolete o58_kill */ "stat", /* 38 = stat */ "getppid", /* 39 = getppid */ "lstat", /* 40 = lstat */ @@ -103,7 +103,7 @@ char *syscallnames[] = { "setgroups", /* 80 = setgroups */ "getpgrp", /* 81 = getpgrp */ "setpgid", /* 82 = setpgid */ - "osendsyslog", /* 83 = osendsyslog */ + "#83 (obsolete osendsyslog)", /* 83 = obsolete osendsyslog */ "utimensat", /* 84 = utimensat */ "futimens", /* 85 = futimens */ "kbind", /* 86 = kbind */ diff --git a/sys/sys/syscall.h b/sys/sys/syscall.h index 8ce4721cbc4..3188e5201f5 100644 --- a/sys/sys/syscall.h +++ b/sys/sys/syscall.h @@ -1,10 +1,10 @@ -/* $OpenBSD: syscall.h,v 1.180 2016/03/30 07:49:44 guenther Exp $ */ +/* $OpenBSD: syscall.h,v 1.181 2016/05/31 22:10:34 deraadt Exp $ */ /* * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * created from; OpenBSD: syscalls.master,v 1.169 2016/03/30 07:49:11 guenther Exp + * created from; OpenBSD: syscalls.master,v 1.172 2016/05/31 22:08:53 deraadt Exp */ /* syscall: "syscall" ret: "int" args: "int" "..." */ @@ -118,9 +118,7 @@ /* syscall: "sync" ret: "void" args: */ #define SYS_sync 36 -/* syscall: "o58_kill" ret: "int" args: "int" "int" */ -#define SYS_o58_kill 37 - + /* 37 is obsolete o58_kill */ /* syscall: "stat" ret: "int" args: "const char *" "struct stat *" */ #define SYS_stat 38 @@ -256,9 +254,7 @@ /* syscall: "setpgid" ret: "int" args: "pid_t" "pid_t" */ #define SYS_setpgid 82 -/* syscall: "osendsyslog" ret: "int" args: "const void *" "size_t" */ -#define SYS_osendsyslog 83 - + /* 83 is obsolete osendsyslog */ /* syscall: "utimensat" ret: "int" args: "int" "const char *" "const struct timespec *" "int" */ #define SYS_utimensat 84 diff --git a/sys/sys/syscallargs.h b/sys/sys/syscallargs.h index f25a80f0155..da0d74736ba 100644 --- a/sys/sys/syscallargs.h +++ b/sys/sys/syscallargs.h @@ -1,10 +1,10 @@ -/* $OpenBSD: syscallargs.h,v 1.183 2016/03/30 07:49:44 guenther Exp $ */ +/* $OpenBSD: syscallargs.h,v 1.184 2016/05/31 22:10:34 deraadt Exp $ */ /* * System call argument lists. * * DO NOT EDIT-- this file is automatically generated. - * created from; OpenBSD: syscalls.master,v 1.169 2016/03/30 07:49:11 guenther Exp + * created from; OpenBSD: syscalls.master,v 1.172 2016/05/31 22:08:53 deraadt Exp */ #ifdef syscallarg @@ -186,11 +186,6 @@ struct sys_fchflags_args { syscallarg(u_int) flags; }; -struct sys_o58_kill_args { - syscallarg(int) pid; - syscallarg(int) signum; -}; - struct sys_stat_args { syscallarg(const char *) path; syscallarg(struct stat *) ub; @@ -401,11 +396,6 @@ struct sys_setpgid_args { syscallarg(pid_t) pgid; }; -struct sys_osendsyslog_args { - syscallarg(const void *) buf; - syscallarg(size_t) nbyte; -}; - struct sys_utimensat_args { syscallarg(int) fd; syscallarg(const char *) path; @@ -1146,7 +1136,6 @@ int sys_access(struct proc *, void *, register_t *); int sys_chflags(struct proc *, void *, register_t *); int sys_fchflags(struct proc *, void *, register_t *); int sys_sync(struct proc *, void *, register_t *); -int sys_o58_kill(struct proc *, void *, register_t *); int sys_stat(struct proc *, void *, register_t *); int sys_getppid(struct proc *, void *, register_t *); int sys_lstat(struct proc *, void *, register_t *); @@ -1198,7 +1187,6 @@ int sys_getgroups(struct proc *, void *, register_t *); int sys_setgroups(struct proc *, void *, register_t *); int sys_getpgrp(struct proc *, void *, register_t *); int sys_setpgid(struct proc *, void *, register_t *); -int sys_osendsyslog(struct proc *, void *, register_t *); int sys_utimensat(struct proc *, void *, register_t *); int sys_futimens(struct proc *, void *, register_t *); int sys_kbind(struct proc *, void *, register_t *); -- cgit v1.2.3