Module Name: src
Committed By: thorpej
Date: Wed Dec 16 03:08:01 UTC 2020
Modified Files:
src/sys/compat/linux32/arch/amd64 [thorpej-futex]: linux32_syscall.h
linux32_syscallargs.h linux32_syscalls.c linux32_sysent.c
linux32_systrace_args.c
Log Message:
Regen for eventfd.
To generate a diff of this commit:
cvs rdiff -u -r1.81 -r1.81.2.1 \
src/sys/compat/linux32/arch/amd64/linux32_syscall.h \
src/sys/compat/linux32/arch/amd64/linux32_syscallargs.h \
src/sys/compat/linux32/arch/amd64/linux32_syscalls.c \
src/sys/compat/linux32/arch/amd64/linux32_sysent.c
cvs rdiff -u -r1.8 -r1.8.2.1 \
src/sys/compat/linux32/arch/amd64/linux32_systrace_args.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/compat/linux32/arch/amd64/linux32_syscall.h
diff -u src/sys/compat/linux32/arch/amd64/linux32_syscall.h:1.81 src/sys/compat/linux32/arch/amd64/linux32_syscall.h:1.81.2.1
--- src/sys/compat/linux32/arch/amd64/linux32_syscall.h:1.81 Sun Apr 26 19:20:58 2020
+++ src/sys/compat/linux32/arch/amd64/linux32_syscall.h Wed Dec 16 03:08:01 2020
@@ -1,10 +1,10 @@
-/* $NetBSD: linux32_syscall.h,v 1.81 2020/04/26 19:20:58 thorpej Exp $ */
+/* $NetBSD: linux32_syscall.h,v 1.81.2.1 2020/12/16 03:08:01 thorpej Exp $ */
/*
* System call numbers.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.71 2020/04/26 18:53:33 thorpej Exp
+ * created from NetBSD: syscalls.master,v 1.71.2.1 2020/12/16 03:07:43 thorpej Exp
*/
#ifndef _LINUX32_SYS_SYSCALL_H_
@@ -702,9 +702,15 @@
/* syscall: "utimensat" ret: "int" args: "int" "netbsd32_charp" "linux32_timespecp_t" "int" */
#define LINUX32_SYS_utimensat 320
+/* syscall: "eventfd" ret: "int" args: "unsigned int" */
+#define LINUX32_SYS_eventfd 323
+
/* syscall: "fallocate" ret: "int" args: "int" "int" "off_t" "off_t" */
#define LINUX32_SYS_fallocate 324
+/* syscall: "eventfd2" ret: "int" args: "unsigned int" "int" */
+#define LINUX32_SYS_eventfd2 328
+
/* syscall: "dup3" ret: "int" args: "int" "int" "int" */
#define LINUX32_SYS_dup3 330
Index: src/sys/compat/linux32/arch/amd64/linux32_syscallargs.h
diff -u src/sys/compat/linux32/arch/amd64/linux32_syscallargs.h:1.81 src/sys/compat/linux32/arch/amd64/linux32_syscallargs.h:1.81.2.1
--- src/sys/compat/linux32/arch/amd64/linux32_syscallargs.h:1.81 Sun Apr 26 19:20:58 2020
+++ src/sys/compat/linux32/arch/amd64/linux32_syscallargs.h Wed Dec 16 03:08:01 2020
@@ -1,10 +1,10 @@
-/* $NetBSD: linux32_syscallargs.h,v 1.81 2020/04/26 19:20:58 thorpej Exp $ */
+/* $NetBSD: linux32_syscallargs.h,v 1.81.2.1 2020/12/16 03:08:01 thorpej Exp $ */
/*
* System call argument lists.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.71 2020/04/26 18:53:33 thorpej Exp
+ * created from NetBSD: syscalls.master,v 1.71.2.1 2020/12/16 03:07:43 thorpej Exp
*/
#ifndef _LINUX32_SYS_SYSCALLARGS_H_
@@ -1004,6 +1004,11 @@ struct linux32_sys_utimensat_args {
};
check_syscall_args(linux32_sys_utimensat)
+struct linux32_sys_eventfd_args {
+ syscallarg(unsigned int) initval;
+};
+check_syscall_args(linux32_sys_eventfd)
+
struct linux32_sys_fallocate_args {
syscallarg(int) fd;
syscallarg(int) mode;
@@ -1012,6 +1017,12 @@ struct linux32_sys_fallocate_args {
};
check_syscall_args(linux32_sys_fallocate)
+struct linux32_sys_eventfd2_args {
+ syscallarg(unsigned int) initval;
+ syscallarg(int) flags;
+};
+check_syscall_args(linux32_sys_eventfd2)
+
struct linux32_sys_dup3_args {
syscallarg(int) from;
syscallarg(int) to;
@@ -1467,8 +1478,12 @@ int netbsd32___futex_get_robust_list(str
int linux32_sys_utimensat(struct lwp *, const struct linux32_sys_utimensat_args *, register_t *);
+int linux32_sys_eventfd(struct lwp *, const struct linux32_sys_eventfd_args *, register_t *);
+
int linux32_sys_fallocate(struct lwp *, const struct linux32_sys_fallocate_args *, register_t *);
+int linux32_sys_eventfd2(struct lwp *, const struct linux32_sys_eventfd2_args *, register_t *);
+
int linux32_sys_dup3(struct lwp *, const struct linux32_sys_dup3_args *, register_t *);
int linux32_sys_pipe2(struct lwp *, const struct linux32_sys_pipe2_args *, register_t *);
Index: src/sys/compat/linux32/arch/amd64/linux32_syscalls.c
diff -u src/sys/compat/linux32/arch/amd64/linux32_syscalls.c:1.81 src/sys/compat/linux32/arch/amd64/linux32_syscalls.c:1.81.2.1
--- src/sys/compat/linux32/arch/amd64/linux32_syscalls.c:1.81 Sun Apr 26 19:20:58 2020
+++ src/sys/compat/linux32/arch/amd64/linux32_syscalls.c Wed Dec 16 03:08:01 2020
@@ -1,14 +1,14 @@
-/* $NetBSD: linux32_syscalls.c,v 1.81 2020/04/26 19:20:58 thorpej Exp $ */
+/* $NetBSD: linux32_syscalls.c,v 1.81.2.1 2020/12/16 03:08:01 thorpej Exp $ */
/*
* System call names.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.71 2020/04/26 18:53:33 thorpej Exp
+ * created from NetBSD: syscalls.master,v 1.71.2.1 2020/12/16 03:07:43 thorpej Exp
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux32_syscalls.c,v 1.81 2020/04/26 19:20:58 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux32_syscalls.c,v 1.81.2.1 2020/12/16 03:08:01 thorpej Exp $");
#if defined(_KERNEL_OPT)
#include <sys/param.h>
@@ -362,12 +362,12 @@ const char *const linux32_syscallnames[]
/* 320 */ "utimensat",
/* 321 */ "#321 (unimplemented signalfd)",
/* 322 */ "#322 (unimplemented timerfd_create)",
- /* 323 */ "#323 (unimplemented eventfd)",
+ /* 323 */ "eventfd",
/* 324 */ "fallocate",
/* 325 */ "#325 (unimplemented timerfd_settime)",
/* 326 */ "#326 (unimplemented timerfd_gettime)",
/* 327 */ "#327 (unimplemented signalfd4)",
- /* 328 */ "#328 (unimplemented eventfd2)",
+ /* 328 */ "eventfd2",
/* 329 */ "#329 (unimplemented epoll_create1)",
/* 330 */ "dup3",
/* 331 */ "pipe2",
@@ -881,12 +881,12 @@ const char *const altlinux32_syscallname
/* 320 */ NULL, /* utimensat */
/* 321 */ NULL, /* unimplemented signalfd */
/* 322 */ NULL, /* unimplemented timerfd_create */
- /* 323 */ NULL, /* unimplemented eventfd */
+ /* 323 */ NULL, /* eventfd */
/* 324 */ NULL, /* fallocate */
/* 325 */ NULL, /* unimplemented timerfd_settime */
/* 326 */ NULL, /* unimplemented timerfd_gettime */
/* 327 */ NULL, /* unimplemented signalfd4 */
- /* 328 */ NULL, /* unimplemented eventfd2 */
+ /* 328 */ NULL, /* eventfd2 */
/* 329 */ NULL, /* unimplemented epoll_create1 */
/* 330 */ NULL, /* dup3 */
/* 331 */ NULL, /* pipe2 */
Index: src/sys/compat/linux32/arch/amd64/linux32_sysent.c
diff -u src/sys/compat/linux32/arch/amd64/linux32_sysent.c:1.81 src/sys/compat/linux32/arch/amd64/linux32_sysent.c:1.81.2.1
--- src/sys/compat/linux32/arch/amd64/linux32_sysent.c:1.81 Sun Apr 26 19:20:58 2020
+++ src/sys/compat/linux32/arch/amd64/linux32_sysent.c Wed Dec 16 03:08:01 2020
@@ -1,14 +1,14 @@
-/* $NetBSD: linux32_sysent.c,v 1.81 2020/04/26 19:20:58 thorpej Exp $ */
+/* $NetBSD: linux32_sysent.c,v 1.81.2.1 2020/12/16 03:08:01 thorpej Exp $ */
/*
* System call switch table.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.71 2020/04/26 18:53:33 thorpej Exp
+ * created from NetBSD: syscalls.master,v 1.71.2.1 2020/12/16 03:07:43 thorpej Exp
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux32_sysent.c,v 1.81 2020/04/26 19:20:58 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux32_sysent.c,v 1.81.2.1 2020/12/16 03:08:01 thorpej Exp $");
#include <sys/param.h>
#include <sys/poll.h>
@@ -1216,8 +1216,9 @@ struct sysent linux32_sysent[] = {
.sy_call = linux_sys_nosys,
}, /* 322 = filler */
{
- .sy_call = linux_sys_nosys,
- }, /* 323 = filler */
+ ns(struct linux32_sys_eventfd_args),
+ .sy_call = (sy_call_t *)linux32_sys_eventfd
+ }, /* 323 = eventfd */
{
ns(struct linux32_sys_fallocate_args),
.sy_flags = SYCALL_NARGS64_VAL(2) | SYCALL_ARG3_64 | SYCALL_ARG2_64,
@@ -1233,8 +1234,9 @@ struct sysent linux32_sysent[] = {
.sy_call = linux_sys_nosys,
}, /* 327 = filler */
{
- .sy_call = linux_sys_nosys,
- }, /* 328 = filler */
+ ns(struct linux32_sys_eventfd2_args),
+ .sy_call = (sy_call_t *)linux32_sys_eventfd2
+ }, /* 328 = eventfd2 */
{
.sy_call = linux_sys_nosys,
}, /* 329 = filler */
Index: src/sys/compat/linux32/arch/amd64/linux32_systrace_args.c
diff -u src/sys/compat/linux32/arch/amd64/linux32_systrace_args.c:1.8 src/sys/compat/linux32/arch/amd64/linux32_systrace_args.c:1.8.2.1
--- src/sys/compat/linux32/arch/amd64/linux32_systrace_args.c:1.8 Sun Apr 26 19:20:58 2020
+++ src/sys/compat/linux32/arch/amd64/linux32_systrace_args.c Wed Dec 16 03:08:01 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: linux32_systrace_args.c,v 1.8 2020/04/26 19:20:58 thorpej Exp $ */
+/* $NetBSD: linux32_systrace_args.c,v 1.8.2.1 2020/12/16 03:08:01 thorpej Exp $ */
/*
* System call argument to DTrace register array converstion.
@@ -1847,6 +1847,13 @@ systrace_args(register_t sysnum, const v
*n_args = 4;
break;
}
+ /* linux32_sys_eventfd */
+ case 323: {
+ const struct linux32_sys_eventfd_args *p = params;
+ uarg[0] = SCARG(p, initval); /* unsigned int */
+ *n_args = 1;
+ break;
+ }
/* linux32_sys_fallocate */
case 324: {
const struct linux32_sys_fallocate_args *p = params;
@@ -1857,6 +1864,14 @@ systrace_args(register_t sysnum, const v
*n_args = 4;
break;
}
+ /* linux32_sys_eventfd2 */
+ case 328: {
+ const struct linux32_sys_eventfd2_args *p = params;
+ uarg[0] = SCARG(p, initval); /* unsigned int */
+ iarg[1] = SCARG(p, flags); /* int */
+ *n_args = 2;
+ break;
+ }
/* linux32_sys_dup3 */
case 330: {
const struct linux32_sys_dup3_args *p = params;
@@ -4878,6 +4893,16 @@ systrace_entry_setargdesc(int sysnum, in
break;
};
break;
+ /* linux32_sys_eventfd */
+ case 323:
+ switch(ndx) {
+ case 0:
+ p = "unsigned int";
+ break;
+ default:
+ break;
+ };
+ break;
/* linux32_sys_fallocate */
case 324:
switch(ndx) {
@@ -4897,6 +4922,19 @@ systrace_entry_setargdesc(int sysnum, in
break;
};
break;
+ /* linux32_sys_eventfd2 */
+ case 328:
+ switch(ndx) {
+ case 0:
+ p = "unsigned int";
+ break;
+ case 1:
+ p = "int";
+ break;
+ default:
+ break;
+ };
+ break;
/* linux32_sys_dup3 */
case 330:
switch(ndx) {
@@ -6006,11 +6044,21 @@ systrace_return_setargdesc(int sysnum, i
if (ndx == 0 || ndx == 1)
p = "int";
break;
+ /* linux32_sys_eventfd */
+ case 323:
+ if (ndx == 0 || ndx == 1)
+ p = "int";
+ break;
/* linux32_sys_fallocate */
case 324:
if (ndx == 0 || ndx == 1)
p = "int";
break;
+ /* linux32_sys_eventfd2 */
+ case 328:
+ if (ndx == 0 || ndx == 1)
+ p = "int";
+ break;
/* linux32_sys_dup3 */
case 330:
if (ndx == 0 || ndx == 1)
