summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormpi <mpi@openbsd.org>2017-04-28 13:51:14 +0000
committermpi <mpi@openbsd.org>2017-04-28 13:51:14 +0000
commitd67af8da0540805f149bff2eebf04ad42c63d926 (patch)
treeb3d914e96743cc704ca548964cab2d7075157d06
parentAdd futex(2) syscall based on a sane subset of its Linux equivalent. (diff)
downloadwireguard-openbsd-d67af8da0540805f149bff2eebf04ad42c63d926.tar.xz
wireguard-openbsd-d67af8da0540805f149bff2eebf04ad42c63d926.zip
regen
-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.h13
4 files changed, 23 insertions, 12 deletions
diff --git a/sys/kern/init_sysent.c b/sys/kern/init_sysent.c
index f4c21ea0895..08e858abc7c 100644
--- a/sys/kern/init_sysent.c
+++ b/sys/kern/init_sysent.c
@@ -1,10 +1,10 @@
-/* $OpenBSD: init_sysent.c,v 1.187 2017/04/13 04:09:46 guenther Exp $ */
+/* $OpenBSD: init_sysent.c,v 1.188 2017/04/28 13:51:14 mpi Exp $ */
/*
* System call switch table.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from; OpenBSD: syscalls.master,v 1.175 2017/04/13 04:06:46 guenther Exp
+ * created from; OpenBSD: syscalls.master,v 1.176 2017/04/28 13:50:55 mpi Exp
*/
#include <sys/param.h>
@@ -198,8 +198,8 @@ struct sysent sysent[] = {
sys_getpgrp }, /* 81 = getpgrp */
{ 2, s(struct sys_setpgid_args), 0,
sys_setpgid }, /* 82 = setpgid */
- { 0, 0, 0,
- sys_nosys }, /* 83 = obsolete osendsyslog */
+ { 5, s(struct sys_futex_args), SY_NOLOCK | 0,
+ sys_futex }, /* 83 = futex */
{ 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 4d46afa04a5..979c573f97c 100644
--- a/sys/kern/syscalls.c
+++ b/sys/kern/syscalls.c
@@ -1,10 +1,10 @@
-/* $OpenBSD: syscalls.c,v 1.186 2017/04/13 04:09:46 guenther Exp $ */
+/* $OpenBSD: syscalls.c,v 1.187 2017/04/28 13:51:14 mpi Exp $ */
/*
* System call names.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from; OpenBSD: syscalls.master,v 1.175 2017/04/13 04:06:46 guenther Exp
+ * created from; OpenBSD: syscalls.master,v 1.176 2017/04/28 13:50:55 mpi Exp
*/
char *syscallnames[] = {
@@ -103,7 +103,7 @@ char *syscallnames[] = {
"setgroups", /* 80 = setgroups */
"getpgrp", /* 81 = getpgrp */
"setpgid", /* 82 = setpgid */
- "#83 (obsolete osendsyslog)", /* 83 = obsolete osendsyslog */
+ "futex", /* 83 = futex */
"utimensat", /* 84 = utimensat */
"futimens", /* 85 = futimens */
"kbind", /* 86 = kbind */
diff --git a/sys/sys/syscall.h b/sys/sys/syscall.h
index 281854394f8..2dc62f35d24 100644
--- a/sys/sys/syscall.h
+++ b/sys/sys/syscall.h
@@ -1,10 +1,10 @@
-/* $OpenBSD: syscall.h,v 1.185 2017/04/13 04:09:46 guenther Exp $ */
+/* $OpenBSD: syscall.h,v 1.186 2017/04/28 13:51:14 mpi Exp $ */
/*
* System call numbers.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from; OpenBSD: syscalls.master,v 1.175 2017/04/13 04:06:46 guenther Exp
+ * created from; OpenBSD: syscalls.master,v 1.176 2017/04/28 13:50:55 mpi Exp
*/
/* syscall: "syscall" ret: "int" args: "int" "..." */
@@ -252,7 +252,9 @@
/* syscall: "setpgid" ret: "int" args: "pid_t" "pid_t" */
#define SYS_setpgid 82
- /* 83 is obsolete osendsyslog */
+/* syscall: "futex" ret: "int" args: "uint32_t *" "int" "int" "const struct timespec *" "uint32_t *" */
+#define SYS_futex 83
+
/* 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 d1e721f5ebf..6679acf51eb 100644
--- a/sys/sys/syscallargs.h
+++ b/sys/sys/syscallargs.h
@@ -1,10 +1,10 @@
-/* $OpenBSD: syscallargs.h,v 1.188 2017/04/13 04:09:46 guenther Exp $ */
+/* $OpenBSD: syscallargs.h,v 1.189 2017/04/28 13:51:14 mpi Exp $ */
/*
* System call argument lists.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from; OpenBSD: syscalls.master,v 1.175 2017/04/13 04:06:46 guenther Exp
+ * created from; OpenBSD: syscalls.master,v 1.176 2017/04/28 13:50:55 mpi Exp
*/
#ifdef syscallarg
@@ -391,6 +391,14 @@ struct sys_setpgid_args {
syscallarg(pid_t) pgid;
};
+struct sys_futex_args {
+ syscallarg(uint32_t *) f;
+ syscallarg(int) op;
+ syscallarg(int) val;
+ syscallarg(const struct timespec *) timeout;
+ syscallarg(uint32_t *) g;
+};
+
struct sys_utimensat_args {
syscallarg(int) fd;
syscallarg(const char *) path;
@@ -1181,6 +1189,7 @@ 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_futex(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 *);