summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorguenther <guenther@openbsd.org>2015-09-13 17:09:21 +0000
committerguenther <guenther@openbsd.org>2015-09-13 17:09:21 +0000
commitfeb3ad4caa22c65a39f6e9a2d89315e163639e6e (patch)
tree1835c04acfea001d3543ca51dbb3560aa39a8aa4
parentRename __sysctl syscall to just sysctl, as the userland wrapper is no longer (diff)
downloadwireguard-openbsd-feb3ad4caa22c65a39f6e9a2d89315e163639e6e.tar.xz
wireguard-openbsd-feb3ad4caa22c65a39f6e9a2d89315e163639e6e.zip
sync
-rw-r--r--sys/kern/init_sysent.c8
-rw-r--r--sys/kern/syscalls.c6
-rw-r--r--sys/sys/syscall.h8
-rw-r--r--sys/sys/syscallargs.h8
4 files changed, 15 insertions, 15 deletions
diff --git a/sys/kern/init_sysent.c b/sys/kern/init_sysent.c
index 1b0c7f51ebd..f6fac6685fa 100644
--- a/sys/kern/init_sysent.c
+++ b/sys/kern/init_sysent.c
@@ -1,10 +1,10 @@
-/* $OpenBSD: init_sysent.c,v 1.171 2015/09/09 17:57:57 deraadt Exp $ */
+/* $OpenBSD: init_sysent.c,v 1.172 2015/09/13 17:09:21 guenther Exp $ */
/*
* System call switch table.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from; OpenBSD: syscalls.master,v 1.158 2015/09/09 17:56:59 deraadt Exp
+ * created from; OpenBSD: syscalls.master,v 1.159 2015/09/13 17:08:03 guenther Exp
*/
#include <sys/param.h>
@@ -441,8 +441,8 @@ struct sysent sysent[] = {
sys_truncate }, /* 200 = truncate */
{ 3, s(struct sys_ftruncate_args), 0,
sys_ftruncate }, /* 201 = ftruncate */
- { 6, s(struct sys___sysctl_args), 0,
- sys___sysctl }, /* 202 = __sysctl */
+ { 6, s(struct sys_sysctl_args), 0,
+ sys_sysctl }, /* 202 = sysctl */
{ 2, s(struct sys_mlock_args), 0,
sys_mlock }, /* 203 = mlock */
{ 2, s(struct sys_munlock_args), 0,
diff --git a/sys/kern/syscalls.c b/sys/kern/syscalls.c
index 20f4a19a105..768cc5e2632 100644
--- a/sys/kern/syscalls.c
+++ b/sys/kern/syscalls.c
@@ -1,10 +1,10 @@
-/* $OpenBSD: syscalls.c,v 1.170 2015/09/09 17:57:57 deraadt Exp $ */
+/* $OpenBSD: syscalls.c,v 1.171 2015/09/13 17:09:21 guenther Exp $ */
/*
* System call names.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from; OpenBSD: syscalls.master,v 1.158 2015/09/09 17:56:59 deraadt Exp
+ * created from; OpenBSD: syscalls.master,v 1.159 2015/09/13 17:08:03 guenther Exp
*/
char *syscallnames[] = {
@@ -226,7 +226,7 @@ char *syscallnames[] = {
"lseek", /* 199 = lseek */
"truncate", /* 200 = truncate */
"ftruncate", /* 201 = ftruncate */
- "__sysctl", /* 202 = __sysctl */
+ "sysctl", /* 202 = sysctl */
"mlock", /* 203 = mlock */
"munlock", /* 204 = munlock */
"#205 (unimplemented sys_undelete)", /* 205 = unimplemented sys_undelete */
diff --git a/sys/sys/syscall.h b/sys/sys/syscall.h
index c9d017c722c..e3c6480e982 100644
--- a/sys/sys/syscall.h
+++ b/sys/sys/syscall.h
@@ -1,10 +1,10 @@
-/* $OpenBSD: syscall.h,v 1.169 2015/09/09 17:57:57 deraadt Exp $ */
+/* $OpenBSD: syscall.h,v 1.170 2015/09/13 17:09:21 guenther Exp $ */
/*
* System call numbers.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from; OpenBSD: syscalls.master,v 1.158 2015/09/09 17:56:59 deraadt Exp
+ * created from; OpenBSD: syscalls.master,v 1.159 2015/09/13 17:08:03 guenther Exp
*/
/* syscall: "syscall" ret: "int" args: "int" "..." */
@@ -488,8 +488,8 @@
/* syscall: "ftruncate" ret: "int" args: "int" "int" "off_t" */
#define SYS_ftruncate 201
-/* syscall: "__sysctl" ret: "int" args: "const int *" "u_int" "void *" "size_t *" "void *" "size_t" */
-#define SYS___sysctl 202
+/* syscall: "sysctl" ret: "int" args: "const int *" "u_int" "void *" "size_t *" "void *" "size_t" */
+#define SYS_sysctl 202
/* syscall: "mlock" ret: "int" args: "const void *" "size_t" */
#define SYS_mlock 203
diff --git a/sys/sys/syscallargs.h b/sys/sys/syscallargs.h
index 707394fd3dd..7916443db71 100644
--- a/sys/sys/syscallargs.h
+++ b/sys/sys/syscallargs.h
@@ -1,10 +1,10 @@
-/* $OpenBSD: syscallargs.h,v 1.172 2015/09/09 17:57:57 deraadt Exp $ */
+/* $OpenBSD: syscallargs.h,v 1.173 2015/09/13 17:09:21 guenther Exp $ */
/*
* System call argument lists.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from; OpenBSD: syscalls.master,v 1.158 2015/09/09 17:56:59 deraadt Exp
+ * created from; OpenBSD: syscalls.master,v 1.159 2015/09/13 17:08:03 guenther Exp
*/
#ifdef syscallarg
@@ -765,7 +765,7 @@ struct sys_ftruncate_args {
syscallarg(off_t) length;
};
-struct sys___sysctl_args {
+struct sys_sysctl_args {
syscallarg(const int *) name;
syscallarg(u_int) namelen;
syscallarg(void *) old;
@@ -1243,7 +1243,7 @@ int sys_mmap(struct proc *, void *, register_t *);
int sys_lseek(struct proc *, void *, register_t *);
int sys_truncate(struct proc *, void *, register_t *);
int sys_ftruncate(struct proc *, void *, register_t *);
-int sys___sysctl(struct proc *, void *, register_t *);
+int sys_sysctl(struct proc *, void *, register_t *);
int sys_mlock(struct proc *, void *, register_t *);
int sys_munlock(struct proc *, void *, register_t *);
int sys_getpgid(struct proc *, void *, register_t *);