Module Name: src
Committed By: thorpej
Date: Sun Apr 26 19:20:19 UTC 2020
Modified Files:
src/sys/compat/linux/arch/alpha: linux_syscall.h linux_syscallargs.h
linux_syscalls.c linux_sysent.c
src/sys/compat/linux/arch/amd64: linux_syscall.h linux_syscallargs.h
linux_syscalls.c linux_sysent.c linux_systrace_args.c
src/sys/compat/linux/arch/arm: linux_syscall.h linux_syscallargs.h
linux_syscalls.c linux_sysent.c linux_systrace_args.c
src/sys/compat/linux/arch/i386: linux_syscall.h linux_syscallargs.h
linux_syscalls.c linux_sysent.c linux_systrace_args.c
src/sys/compat/linux/arch/m68k: linux_syscall.h linux_syscallargs.h
linux_syscalls.c linux_sysent.c
src/sys/compat/linux/arch/mips: linux_syscall.h linux_syscallargs.h
linux_syscalls.c linux_sysent.c
src/sys/compat/linux/arch/powerpc: linux_syscall.h linux_syscallargs.h
linux_syscalls.c linux_sysent.c
Log Message:
Regen for native futex calls.
To generate a diff of this commit:
cvs rdiff -u -r1.109 -r1.110 src/sys/compat/linux/arch/alpha/linux_syscall.h \
src/sys/compat/linux/arch/alpha/linux_sysent.c
cvs rdiff -u -r1.108 -r1.109 \
src/sys/compat/linux/arch/alpha/linux_syscallargs.h
cvs rdiff -u -r1.110 -r1.111 src/sys/compat/linux/arch/alpha/linux_syscalls.c
cvs rdiff -u -r1.70 -r1.71 src/sys/compat/linux/arch/amd64/linux_syscall.h \
src/sys/compat/linux/arch/amd64/linux_syscallargs.h \
src/sys/compat/linux/arch/amd64/linux_syscalls.c \
src/sys/compat/linux/arch/amd64/linux_sysent.c
cvs rdiff -u -r1.14 -r1.15 \
src/sys/compat/linux/arch/amd64/linux_systrace_args.c
cvs rdiff -u -r1.81 -r1.82 src/sys/compat/linux/arch/arm/linux_syscall.h \
src/sys/compat/linux/arch/arm/linux_syscallargs.h \
src/sys/compat/linux/arch/arm/linux_syscalls.c \
src/sys/compat/linux/arch/arm/linux_sysent.c
cvs rdiff -u -r1.14 -r1.15 \
src/sys/compat/linux/arch/arm/linux_systrace_args.c
cvs rdiff -u -r1.115 -r1.116 src/sys/compat/linux/arch/i386/linux_syscall.h \
src/sys/compat/linux/arch/i386/linux_syscallargs.h \
src/sys/compat/linux/arch/i386/linux_sysent.c
cvs rdiff -u -r1.116 -r1.117 src/sys/compat/linux/arch/i386/linux_syscalls.c
cvs rdiff -u -r1.10 -r1.11 \
src/sys/compat/linux/arch/i386/linux_systrace_args.c
cvs rdiff -u -r1.107 -r1.108 src/sys/compat/linux/arch/m68k/linux_syscall.h \
src/sys/compat/linux/arch/m68k/linux_syscalls.c \
src/sys/compat/linux/arch/m68k/linux_sysent.c
cvs rdiff -u -r1.106 -r1.107 \
src/sys/compat/linux/arch/m68k/linux_syscallargs.h
cvs rdiff -u -r1.79 -r1.80 src/sys/compat/linux/arch/mips/linux_syscall.h
cvs rdiff -u -r1.78 -r1.79 src/sys/compat/linux/arch/mips/linux_syscallargs.h \
src/sys/compat/linux/arch/mips/linux_syscalls.c \
src/sys/compat/linux/arch/mips/linux_sysent.c
cvs rdiff -u -r1.85 -r1.86 src/sys/compat/linux/arch/powerpc/linux_syscall.h \
src/sys/compat/linux/arch/powerpc/linux_sysent.c
cvs rdiff -u -r1.84 -r1.85 \
src/sys/compat/linux/arch/powerpc/linux_syscallargs.h \
src/sys/compat/linux/arch/powerpc/linux_syscalls.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/linux/arch/alpha/linux_syscall.h
diff -u src/sys/compat/linux/arch/alpha/linux_syscall.h:1.109 src/sys/compat/linux/arch/alpha/linux_syscall.h:1.110
--- src/sys/compat/linux/arch/alpha/linux_syscall.h:1.109 Sat Nov 9 23:45:07 2019
+++ src/sys/compat/linux/arch/alpha/linux_syscall.h Sun Apr 26 19:20:18 2020
@@ -1,10 +1,10 @@
-/* $NetBSD: linux_syscall.h,v 1.109 2019/11/09 23:45:07 jdolecek Exp $ */
+/* $NetBSD: linux_syscall.h,v 1.110 2020/04/26 19:20:18 thorpej Exp $ */
/*
* System call numbers.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.96 2019/11/09 23:44:31 jdolecek Exp
+ * created from NetBSD: syscalls.master,v 1.97 2020/04/26 18:53:32 thorpej Exp
*/
#ifndef _LINUX_SYS_SYSCALL_H_
@@ -690,11 +690,11 @@
/* syscall: "ppoll" ret: "int" args: "struct pollfd *" "u_int" "struct linux_timespec *" "linux_sigset_t *" */
#define LINUX_SYS_ppoll 464
-/* syscall: "set_robust_list" ret: "int" args: "struct linux_robust_list_head *" "size_t" */
-#define LINUX_SYS_set_robust_list 466
+/* syscall: "__futex_set_robust_list" ret: "int" args: "void *" "size_t" */
+#define LINUX_SYS___futex_set_robust_list 466
-/* syscall: "get_robust_list" ret: "int" args: "int" "struct linux_robust_list_head **" "size_t *" */
-#define LINUX_SYS_get_robust_list 467
+/* syscall: "__futex_get_robust_list" ret: "int" args: "lwpid_t" "void **" "size_t *" */
+#define LINUX_SYS___futex_get_robust_list 467
/* syscall: "utimensat" ret: "int" args: "int" "const char *" "struct linux_timespec *" "int" */
#define LINUX_SYS_utimensat 475
Index: src/sys/compat/linux/arch/alpha/linux_sysent.c
diff -u src/sys/compat/linux/arch/alpha/linux_sysent.c:1.109 src/sys/compat/linux/arch/alpha/linux_sysent.c:1.110
--- src/sys/compat/linux/arch/alpha/linux_sysent.c:1.109 Sat Nov 9 23:45:07 2019
+++ src/sys/compat/linux/arch/alpha/linux_sysent.c Sun Apr 26 19:20:18 2020
@@ -1,14 +1,14 @@
-/* $NetBSD: linux_sysent.c,v 1.109 2019/11/09 23:45:07 jdolecek Exp $ */
+/* $NetBSD: linux_sysent.c,v 1.110 2020/04/26 19:20:18 thorpej Exp $ */
/*
* System call switch table.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.96 2019/11/09 23:44:31 jdolecek Exp
+ * created from NetBSD: syscalls.master,v 1.97 2020/04/26 18:53:32 thorpej Exp
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_sysent.c,v 1.109 2019/11/09 23:45:07 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_sysent.c,v 1.110 2020/04/26 19:20:18 thorpej Exp $");
#if defined(_KERNEL_OPT)
#include "opt_sysv.h"
@@ -1854,15 +1854,15 @@ struct sysent linux_sysent[] = {
.sy_call = linux_sys_nosys,
}, /* 465 = filler */
{
- ns(struct linux_sys_set_robust_list_args),
+ ns(struct sys___futex_set_robust_list_args),
.sy_flags = SYCALL_ARG_PTR,
- .sy_call = (sy_call_t *)linux_sys_set_robust_list
- }, /* 466 = set_robust_list */
+ .sy_call = (sy_call_t *)sys___futex_set_robust_list
+ }, /* 466 = __futex_set_robust_list */
{
- ns(struct linux_sys_get_robust_list_args),
+ ns(struct sys___futex_get_robust_list_args),
.sy_flags = SYCALL_ARG_PTR,
- .sy_call = (sy_call_t *)linux_sys_get_robust_list
- }, /* 467 = get_robust_list */
+ .sy_call = (sy_call_t *)sys___futex_get_robust_list
+ }, /* 467 = __futex_get_robust_list */
{
.sy_call = linux_sys_nosys,
}, /* 468 = filler */
Index: src/sys/compat/linux/arch/alpha/linux_syscallargs.h
diff -u src/sys/compat/linux/arch/alpha/linux_syscallargs.h:1.108 src/sys/compat/linux/arch/alpha/linux_syscallargs.h:1.109
--- src/sys/compat/linux/arch/alpha/linux_syscallargs.h:1.108 Sat Nov 9 23:45:07 2019
+++ src/sys/compat/linux/arch/alpha/linux_syscallargs.h Sun Apr 26 19:20:18 2020
@@ -1,10 +1,10 @@
-/* $NetBSD: linux_syscallargs.h,v 1.108 2019/11/09 23:45:07 jdolecek Exp $ */
+/* $NetBSD: linux_syscallargs.h,v 1.109 2020/04/26 19:20:18 thorpej Exp $ */
/*
* System call argument lists.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.96 2019/11/09 23:44:31 jdolecek Exp
+ * created from NetBSD: syscalls.master,v 1.97 2020/04/26 18:53:32 thorpej Exp
*/
#ifndef _LINUX_SYS_SYSCALLARGS_H_
@@ -1096,18 +1096,9 @@ struct linux_sys_ppoll_args {
};
check_syscall_args(linux_sys_ppoll)
-struct linux_sys_set_robust_list_args {
- syscallarg(struct linux_robust_list_head *) head;
- syscallarg(size_t) len;
-};
-check_syscall_args(linux_sys_set_robust_list)
+struct sys___futex_set_robust_list_args;
-struct linux_sys_get_robust_list_args {
- syscallarg(int) pid;
- syscallarg(struct linux_robust_list_head **) head;
- syscallarg(size_t *) len;
-};
-check_syscall_args(linux_sys_get_robust_list)
+struct sys___futex_get_robust_list_args;
struct linux_sys_utimensat_args {
syscallarg(int) fd;
@@ -1623,9 +1614,9 @@ int linux_sys_pselect6(struct lwp *, con
int linux_sys_ppoll(struct lwp *, const struct linux_sys_ppoll_args *, register_t *);
-int linux_sys_set_robust_list(struct lwp *, const struct linux_sys_set_robust_list_args *, register_t *);
+int sys___futex_set_robust_list(struct lwp *, const struct sys___futex_set_robust_list_args *, register_t *);
-int linux_sys_get_robust_list(struct lwp *, const struct linux_sys_get_robust_list_args *, register_t *);
+int sys___futex_get_robust_list(struct lwp *, const struct sys___futex_get_robust_list_args *, register_t *);
int linux_sys_utimensat(struct lwp *, const struct linux_sys_utimensat_args *, register_t *);
Index: src/sys/compat/linux/arch/alpha/linux_syscalls.c
diff -u src/sys/compat/linux/arch/alpha/linux_syscalls.c:1.110 src/sys/compat/linux/arch/alpha/linux_syscalls.c:1.111
--- src/sys/compat/linux/arch/alpha/linux_syscalls.c:1.110 Sat Nov 9 23:45:07 2019
+++ src/sys/compat/linux/arch/alpha/linux_syscalls.c Sun Apr 26 19:20:18 2020
@@ -1,14 +1,14 @@
-/* $NetBSD: linux_syscalls.c,v 1.110 2019/11/09 23:45:07 jdolecek Exp $ */
+/* $NetBSD: linux_syscalls.c,v 1.111 2020/04/26 19:20:18 thorpej Exp $ */
/*
* System call names.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.96 2019/11/09 23:44:31 jdolecek Exp
+ * created from NetBSD: syscalls.master,v 1.97 2020/04/26 18:53:32 thorpej Exp
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_syscalls.c,v 1.110 2019/11/09 23:45:07 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_syscalls.c,v 1.111 2020/04/26 19:20:18 thorpej Exp $");
#if defined(_KERNEL_OPT)
#if defined(_KERNEL_OPT)
@@ -525,8 +525,8 @@ const char *const linux_syscallnames[] =
/* 463 */ "pselect6",
/* 464 */ "ppoll",
/* 465 */ "#465 (unimplemented unshare)",
- /* 466 */ "set_robust_list",
- /* 467 */ "get_robust_list",
+ /* 466 */ "__futex_set_robust_list",
+ /* 467 */ "__futex_get_robust_list",
/* 468 */ "#468 (unimplemented splice)",
/* 469 */ "#469 (unimplemented sync_file_range)",
/* 470 */ "#470 (unimplemented tee)",
@@ -1066,8 +1066,8 @@ const char *const altlinux_syscallnames[
/* 463 */ NULL, /* pselect6 */
/* 464 */ NULL, /* ppoll */
/* 465 */ NULL, /* unimplemented unshare */
- /* 466 */ NULL, /* set_robust_list */
- /* 467 */ NULL, /* get_robust_list */
+ /* 466 */ NULL, /* __futex_set_robust_list */
+ /* 467 */ NULL, /* __futex_get_robust_list */
/* 468 */ NULL, /* unimplemented splice */
/* 469 */ NULL, /* unimplemented sync_file_range */
/* 470 */ NULL, /* unimplemented tee */
Index: src/sys/compat/linux/arch/amd64/linux_syscall.h
diff -u src/sys/compat/linux/arch/amd64/linux_syscall.h:1.70 src/sys/compat/linux/arch/amd64/linux_syscall.h:1.71
--- src/sys/compat/linux/arch/amd64/linux_syscall.h:1.70 Sat Nov 9 23:45:07 2019
+++ src/sys/compat/linux/arch/amd64/linux_syscall.h Sun Apr 26 19:20:18 2020
@@ -1,10 +1,10 @@
-/* $NetBSD: linux_syscall.h,v 1.70 2019/11/09 23:45:07 jdolecek Exp $ */
+/* $NetBSD: linux_syscall.h,v 1.71 2020/04/26 19:20:18 thorpej Exp $ */
/*
* System call numbers.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.61 2019/11/09 23:44:31 jdolecek Exp
+ * created from NetBSD: syscalls.master,v 1.62 2020/04/26 18:53:32 thorpej Exp
*/
#ifndef _LINUX_SYS_SYSCALL_H_
@@ -636,11 +636,11 @@
/* syscall: "ppoll" ret: "int" args: "struct pollfd *" "u_int" "struct linux_timespec *" "linux_sigset_t *" */
#define LINUX_SYS_ppoll 271
-/* syscall: "set_robust_list" ret: "int" args: "struct linux_robust_list_head *" "size_t" */
-#define LINUX_SYS_set_robust_list 273
+/* syscall: "__futex_set_robust_list" ret: "int" args: "void *" "size_t" */
+#define LINUX_SYS___futex_set_robust_list 273
-/* syscall: "get_robust_list" ret: "int" args: "int" "struct linux_robust_list_head **" "size_t *" */
-#define LINUX_SYS_get_robust_list 274
+/* syscall: "__futex_get_robust_list" ret: "int" args: "lwpid_t" "void **" "size_t *" */
+#define LINUX_SYS___futex_get_robust_list 274
/* syscall: "utimensat" ret: "int" args: "int" "const char *" "struct linux_timespec *" "int" */
#define LINUX_SYS_utimensat 280
Index: src/sys/compat/linux/arch/amd64/linux_syscallargs.h
diff -u src/sys/compat/linux/arch/amd64/linux_syscallargs.h:1.70 src/sys/compat/linux/arch/amd64/linux_syscallargs.h:1.71
--- src/sys/compat/linux/arch/amd64/linux_syscallargs.h:1.70 Sat Nov 9 23:45:07 2019
+++ src/sys/compat/linux/arch/amd64/linux_syscallargs.h Sun Apr 26 19:20:18 2020
@@ -1,10 +1,10 @@
-/* $NetBSD: linux_syscallargs.h,v 1.70 2019/11/09 23:45:07 jdolecek Exp $ */
+/* $NetBSD: linux_syscallargs.h,v 1.71 2020/04/26 19:20:18 thorpej Exp $ */
/*
* System call argument lists.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.61 2019/11/09 23:44:31 jdolecek Exp
+ * created from NetBSD: syscalls.master,v 1.62 2020/04/26 18:53:32 thorpej Exp
*/
#ifndef _LINUX_SYS_SYSCALLARGS_H_
@@ -986,18 +986,9 @@ struct linux_sys_ppoll_args {
};
check_syscall_args(linux_sys_ppoll)
-struct linux_sys_set_robust_list_args {
- syscallarg(struct linux_robust_list_head *) head;
- syscallarg(size_t) len;
-};
-check_syscall_args(linux_sys_set_robust_list)
+struct sys___futex_set_robust_list_args;
-struct linux_sys_get_robust_list_args {
- syscallarg(int) pid;
- syscallarg(struct linux_robust_list_head **) head;
- syscallarg(size_t *) len;
-};
-check_syscall_args(linux_sys_get_robust_list)
+struct sys___futex_get_robust_list_args;
struct linux_sys_utimensat_args {
syscallarg(int) fd;
@@ -1478,9 +1469,9 @@ int linux_sys_pselect6(struct lwp *, con
int linux_sys_ppoll(struct lwp *, const struct linux_sys_ppoll_args *, register_t *);
-int linux_sys_set_robust_list(struct lwp *, const struct linux_sys_set_robust_list_args *, register_t *);
+int sys___futex_set_robust_list(struct lwp *, const struct sys___futex_set_robust_list_args *, register_t *);
-int linux_sys_get_robust_list(struct lwp *, const struct linux_sys_get_robust_list_args *, register_t *);
+int sys___futex_get_robust_list(struct lwp *, const struct sys___futex_get_robust_list_args *, register_t *);
int linux_sys_utimensat(struct lwp *, const struct linux_sys_utimensat_args *, register_t *);
Index: src/sys/compat/linux/arch/amd64/linux_syscalls.c
diff -u src/sys/compat/linux/arch/amd64/linux_syscalls.c:1.70 src/sys/compat/linux/arch/amd64/linux_syscalls.c:1.71
--- src/sys/compat/linux/arch/amd64/linux_syscalls.c:1.70 Sat Nov 9 23:45:07 2019
+++ src/sys/compat/linux/arch/amd64/linux_syscalls.c Sun Apr 26 19:20:18 2020
@@ -1,14 +1,14 @@
-/* $NetBSD: linux_syscalls.c,v 1.70 2019/11/09 23:45:07 jdolecek Exp $ */
+/* $NetBSD: linux_syscalls.c,v 1.71 2020/04/26 19:20:18 thorpej Exp $ */
/*
* System call names.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.61 2019/11/09 23:44:31 jdolecek Exp
+ * created from NetBSD: syscalls.master,v 1.62 2020/04/26 18:53:32 thorpej Exp
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_syscalls.c,v 1.70 2019/11/09 23:45:07 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_syscalls.c,v 1.71 2020/04/26 19:20:18 thorpej Exp $");
#if defined(_KERNEL_OPT)
#if defined(_KERNEL_OPT)
@@ -339,8 +339,8 @@ const char *const linux_syscallnames[] =
/* 270 */ "pselect6",
/* 271 */ "ppoll",
/* 272 */ "#272 (unimplemented unshare)",
- /* 273 */ "set_robust_list",
- /* 274 */ "get_robust_list",
+ /* 273 */ "__futex_set_robust_list",
+ /* 274 */ "__futex_get_robust_list",
/* 275 */ "#275 (unimplemented splice)",
/* 276 */ "#276 (unimplemented tee)",
/* 277 */ "#277 (unimplemented sync_file_range)",
@@ -883,8 +883,8 @@ const char *const altlinux_syscallnames[
/* 270 */ NULL, /* pselect6 */
/* 271 */ NULL, /* ppoll */
/* 272 */ NULL, /* unimplemented unshare */
- /* 273 */ NULL, /* set_robust_list */
- /* 274 */ NULL, /* get_robust_list */
+ /* 273 */ NULL, /* __futex_set_robust_list */
+ /* 274 */ NULL, /* __futex_get_robust_list */
/* 275 */ NULL, /* unimplemented splice */
/* 276 */ NULL, /* unimplemented tee */
/* 277 */ NULL, /* unimplemented sync_file_range */
Index: src/sys/compat/linux/arch/amd64/linux_sysent.c
diff -u src/sys/compat/linux/arch/amd64/linux_sysent.c:1.70 src/sys/compat/linux/arch/amd64/linux_sysent.c:1.71
--- src/sys/compat/linux/arch/amd64/linux_sysent.c:1.70 Sat Nov 9 23:45:07 2019
+++ src/sys/compat/linux/arch/amd64/linux_sysent.c Sun Apr 26 19:20:18 2020
@@ -1,14 +1,14 @@
-/* $NetBSD: linux_sysent.c,v 1.70 2019/11/09 23:45:07 jdolecek Exp $ */
+/* $NetBSD: linux_sysent.c,v 1.71 2020/04/26 19:20:18 thorpej Exp $ */
/*
* System call switch table.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.61 2019/11/09 23:44:31 jdolecek Exp
+ * created from NetBSD: syscalls.master,v 1.62 2020/04/26 18:53:32 thorpej Exp
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_sysent.c,v 1.70 2019/11/09 23:45:07 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_sysent.c,v 1.71 2020/04/26 19:20:18 thorpej Exp $");
#if defined(_KERNEL_OPT)
#include "opt_sysv.h"
@@ -1237,15 +1237,15 @@ struct sysent linux_sysent[] = {
.sy_call = linux_sys_nosys,
}, /* 272 = filler */
{
- ns(struct linux_sys_set_robust_list_args),
+ ns(struct sys___futex_set_robust_list_args),
.sy_flags = SYCALL_ARG_PTR,
- .sy_call = (sy_call_t *)linux_sys_set_robust_list
- }, /* 273 = set_robust_list */
+ .sy_call = (sy_call_t *)sys___futex_set_robust_list
+ }, /* 273 = __futex_set_robust_list */
{
- ns(struct linux_sys_get_robust_list_args),
+ ns(struct sys___futex_get_robust_list_args),
.sy_flags = SYCALL_ARG_PTR,
- .sy_call = (sy_call_t *)linux_sys_get_robust_list
- }, /* 274 = get_robust_list */
+ .sy_call = (sy_call_t *)sys___futex_get_robust_list
+ }, /* 274 = __futex_get_robust_list */
{
.sy_call = linux_sys_nosys,
}, /* 275 = filler */
Index: src/sys/compat/linux/arch/amd64/linux_systrace_args.c
diff -u src/sys/compat/linux/arch/amd64/linux_systrace_args.c:1.14 src/sys/compat/linux/arch/amd64/linux_systrace_args.c:1.15
--- src/sys/compat/linux/arch/amd64/linux_systrace_args.c:1.14 Sat Nov 9 23:45:07 2019
+++ src/sys/compat/linux/arch/amd64/linux_systrace_args.c Sun Apr 26 19:20:18 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_systrace_args.c,v 1.14 2019/11/09 23:45:07 jdolecek Exp $ */
+/* $NetBSD: linux_systrace_args.c,v 1.15 2020/04/26 19:20:18 thorpej Exp $ */
/*
* System call argument to DTrace register array converstion.
@@ -1716,20 +1716,20 @@ systrace_args(register_t sysnum, const v
*n_args = 4;
break;
}
- /* linux_sys_set_robust_list */
+ /* sys___futex_set_robust_list */
case 273: {
- const struct linux_sys_set_robust_list_args *p = params;
- uarg[0] = (intptr_t) SCARG(p, head); /* struct linux_robust_list_head * */
+ const struct sys___futex_set_robust_list_args *p = params;
+ uarg[0] = (intptr_t) SCARG(p, head); /* void * */
uarg[1] = SCARG(p, len); /* size_t */
*n_args = 2;
break;
}
- /* linux_sys_get_robust_list */
+ /* sys___futex_get_robust_list */
case 274: {
- const struct linux_sys_get_robust_list_args *p = params;
- iarg[0] = SCARG(p, pid); /* int */
- uarg[1] = (intptr_t) SCARG(p, head); /* struct linux_robust_list_head ** */
- uarg[2] = (intptr_t) SCARG(p, len); /* size_t * */
+ const struct sys___futex_get_robust_list_args *p = params;
+ iarg[0] = SCARG(p, lwpid); /* lwpid_t */
+ uarg[1] = (intptr_t) SCARG(p, headp); /* void ** */
+ uarg[2] = (intptr_t) SCARG(p, lenp); /* size_t * */
*n_args = 3;
break;
}
@@ -4649,11 +4649,11 @@ systrace_entry_setargdesc(int sysnum, in
break;
};
break;
- /* linux_sys_set_robust_list */
+ /* sys___futex_set_robust_list */
case 273:
switch(ndx) {
case 0:
- p = "struct linux_robust_list_head *";
+ p = "void *";
break;
case 1:
p = "size_t";
@@ -4662,14 +4662,14 @@ systrace_entry_setargdesc(int sysnum, in
break;
};
break;
- /* linux_sys_get_robust_list */
+ /* sys___futex_get_robust_list */
case 274:
switch(ndx) {
case 0:
- p = "int";
+ p = "lwpid_t";
break;
case 1:
- p = "struct linux_robust_list_head **";
+ p = "void **";
break;
case 2:
p = "size_t *";
@@ -5801,12 +5801,12 @@ systrace_return_setargdesc(int sysnum, i
if (ndx == 0 || ndx == 1)
p = "int";
break;
- /* linux_sys_set_robust_list */
+ /* sys___futex_set_robust_list */
case 273:
if (ndx == 0 || ndx == 1)
p = "int";
break;
- /* linux_sys_get_robust_list */
+ /* sys___futex_get_robust_list */
case 274:
if (ndx == 0 || ndx == 1)
p = "int";
Index: src/sys/compat/linux/arch/arm/linux_syscall.h
diff -u src/sys/compat/linux/arch/arm/linux_syscall.h:1.81 src/sys/compat/linux/arch/arm/linux_syscall.h:1.82
--- src/sys/compat/linux/arch/arm/linux_syscall.h:1.81 Sat Nov 9 23:45:07 2019
+++ src/sys/compat/linux/arch/arm/linux_syscall.h Sun Apr 26 19:20:18 2020
@@ -1,10 +1,10 @@
-/* $NetBSD: linux_syscall.h,v 1.81 2019/11/09 23:45:07 jdolecek Exp $ */
+/* $NetBSD: linux_syscall.h,v 1.82 2020/04/26 19:20:18 thorpej Exp $ */
/*
* System call numbers.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.68 2019/11/09 23:44:31 jdolecek Exp
+ * created from NetBSD: syscalls.master,v 1.69 2020/04/26 18:53:32 thorpej Exp
*/
#ifndef _LINUX_SYS_SYSCALL_H_
@@ -694,11 +694,11 @@
/* syscall: "ppoll" ret: "int" args: "struct pollfd *" "u_int" "struct linux_timespec *" "linux_sigset_t *" */
#define LINUX_SYS_ppoll 336
-/* syscall: "set_robust_list" ret: "int" args: "struct linux_robust_list_head *" "size_t" */
-#define LINUX_SYS_set_robust_list 338
+/* syscall: "__futex_set_robust_list" ret: "int" args: "void *" "size_t" */
+#define LINUX_SYS___futex_set_robust_list 338
-/* syscall: "get_robust_list" ret: "int" args: "int" "struct linux_robust_list_head **" "size_t *" */
-#define LINUX_SYS_get_robust_list 339
+/* syscall: "__futex_get_robust_list" ret: "int" args: "lwpid_t" "void **" "size_t *" */
+#define LINUX_SYS___futex_get_robust_list 339
/* syscall: "utimensat" ret: "int" args: "int" "const char *" "struct linux_timespec *" "int" */
#define LINUX_SYS_utimensat 348
Index: src/sys/compat/linux/arch/arm/linux_syscallargs.h
diff -u src/sys/compat/linux/arch/arm/linux_syscallargs.h:1.81 src/sys/compat/linux/arch/arm/linux_syscallargs.h:1.82
--- src/sys/compat/linux/arch/arm/linux_syscallargs.h:1.81 Sat Nov 9 23:45:07 2019
+++ src/sys/compat/linux/arch/arm/linux_syscallargs.h Sun Apr 26 19:20:18 2020
@@ -1,10 +1,10 @@
-/* $NetBSD: linux_syscallargs.h,v 1.81 2019/11/09 23:45:07 jdolecek Exp $ */
+/* $NetBSD: linux_syscallargs.h,v 1.82 2020/04/26 19:20:18 thorpej Exp $ */
/*
* System call argument lists.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.68 2019/11/09 23:44:31 jdolecek Exp
+ * created from NetBSD: syscalls.master,v 1.69 2020/04/26 18:53:32 thorpej Exp
*/
#ifndef _LINUX_SYS_SYSCALLARGS_H_
@@ -1060,18 +1060,9 @@ struct linux_sys_ppoll_args {
};
check_syscall_args(linux_sys_ppoll)
-struct linux_sys_set_robust_list_args {
- syscallarg(struct linux_robust_list_head *) head;
- syscallarg(size_t) len;
-};
-check_syscall_args(linux_sys_set_robust_list)
+struct sys___futex_set_robust_list_args;
-struct linux_sys_get_robust_list_args {
- syscallarg(int) pid;
- syscallarg(struct linux_robust_list_head **) head;
- syscallarg(size_t *) len;
-};
-check_syscall_args(linux_sys_get_robust_list)
+struct sys___futex_get_robust_list_args;
struct linux_sys_utimensat_args {
syscallarg(int) fd;
@@ -1575,9 +1566,9 @@ int linux_sys_pselect6(struct lwp *, con
int linux_sys_ppoll(struct lwp *, const struct linux_sys_ppoll_args *, register_t *);
-int linux_sys_set_robust_list(struct lwp *, const struct linux_sys_set_robust_list_args *, register_t *);
+int sys___futex_set_robust_list(struct lwp *, const struct sys___futex_set_robust_list_args *, register_t *);
-int linux_sys_get_robust_list(struct lwp *, const struct linux_sys_get_robust_list_args *, register_t *);
+int sys___futex_get_robust_list(struct lwp *, const struct sys___futex_get_robust_list_args *, register_t *);
int linux_sys_utimensat(struct lwp *, const struct linux_sys_utimensat_args *, register_t *);
Index: src/sys/compat/linux/arch/arm/linux_syscalls.c
diff -u src/sys/compat/linux/arch/arm/linux_syscalls.c:1.81 src/sys/compat/linux/arch/arm/linux_syscalls.c:1.82
--- src/sys/compat/linux/arch/arm/linux_syscalls.c:1.81 Sat Nov 9 23:45:07 2019
+++ src/sys/compat/linux/arch/arm/linux_syscalls.c Sun Apr 26 19:20:18 2020
@@ -1,14 +1,14 @@
-/* $NetBSD: linux_syscalls.c,v 1.81 2019/11/09 23:45:07 jdolecek Exp $ */
+/* $NetBSD: linux_syscalls.c,v 1.82 2020/04/26 19:20:18 thorpej Exp $ */
/*
* System call names.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.68 2019/11/09 23:44:31 jdolecek Exp
+ * created from NetBSD: syscalls.master,v 1.69 2020/04/26 18:53:32 thorpej Exp
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_syscalls.c,v 1.81 2019/11/09 23:45:07 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_syscalls.c,v 1.82 2020/04/26 19:20:18 thorpej Exp $");
#if defined(_KERNEL_OPT)
#include <sys/param.h>
@@ -373,8 +373,8 @@ const char *const linux_syscallnames[] =
/* 335 */ "pselect6",
/* 336 */ "ppoll",
/* 337 */ "#337 (unimplemented unshare)",
- /* 338 */ "set_robust_list",
- /* 339 */ "get_robust_list",
+ /* 338 */ "__futex_set_robust_list",
+ /* 339 */ "__futex_get_robust_list",
/* 340 */ "#340 (unimplemented splice)",
/* 341 */ "#341 (unimplemented sync_file_range2)",
/* 342 */ "#342 (unimplemented tee)",
@@ -895,8 +895,8 @@ const char *const altlinux_syscallnames[
/* 335 */ NULL, /* pselect6 */
/* 336 */ NULL, /* ppoll */
/* 337 */ NULL, /* unimplemented unshare */
- /* 338 */ NULL, /* set_robust_list */
- /* 339 */ NULL, /* get_robust_list */
+ /* 338 */ NULL, /* __futex_set_robust_list */
+ /* 339 */ NULL, /* __futex_get_robust_list */
/* 340 */ NULL, /* unimplemented splice */
/* 341 */ NULL, /* unimplemented sync_file_range2 */
/* 342 */ NULL, /* unimplemented tee */
Index: src/sys/compat/linux/arch/arm/linux_sysent.c
diff -u src/sys/compat/linux/arch/arm/linux_sysent.c:1.81 src/sys/compat/linux/arch/arm/linux_sysent.c:1.82
--- src/sys/compat/linux/arch/arm/linux_sysent.c:1.81 Sat Nov 9 23:45:07 2019
+++ src/sys/compat/linux/arch/arm/linux_sysent.c Sun Apr 26 19:20:18 2020
@@ -1,14 +1,14 @@
-/* $NetBSD: linux_sysent.c,v 1.81 2019/11/09 23:45:07 jdolecek Exp $ */
+/* $NetBSD: linux_sysent.c,v 1.82 2020/04/26 19:20:18 thorpej Exp $ */
/*
* System call switch table.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.68 2019/11/09 23:44:31 jdolecek Exp
+ * created from NetBSD: syscalls.master,v 1.69 2020/04/26 18:53:32 thorpej Exp
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_sysent.c,v 1.81 2019/11/09 23:45:07 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_sysent.c,v 1.82 2020/04/26 19:20:18 thorpej Exp $");
#include <sys/param.h>
#include <sys/poll.h>
@@ -1404,15 +1404,15 @@ struct sysent linux_sysent[] = {
.sy_call = linux_sys_nosys,
}, /* 337 = filler */
{
- ns(struct linux_sys_set_robust_list_args),
+ ns(struct sys___futex_set_robust_list_args),
.sy_flags = SYCALL_ARG_PTR,
- .sy_call = (sy_call_t *)linux_sys_set_robust_list
- }, /* 338 = set_robust_list */
+ .sy_call = (sy_call_t *)sys___futex_set_robust_list
+ }, /* 338 = __futex_set_robust_list */
{
- ns(struct linux_sys_get_robust_list_args),
+ ns(struct sys___futex_get_robust_list_args),
.sy_flags = SYCALL_ARG_PTR,
- .sy_call = (sy_call_t *)linux_sys_get_robust_list
- }, /* 339 = get_robust_list */
+ .sy_call = (sy_call_t *)sys___futex_get_robust_list
+ }, /* 339 = __futex_get_robust_list */
{
.sy_call = linux_sys_nosys,
}, /* 340 = filler */
Index: src/sys/compat/linux/arch/arm/linux_systrace_args.c
diff -u src/sys/compat/linux/arch/arm/linux_systrace_args.c:1.14 src/sys/compat/linux/arch/arm/linux_systrace_args.c:1.15
--- src/sys/compat/linux/arch/arm/linux_systrace_args.c:1.14 Sat Nov 9 23:45:07 2019
+++ src/sys/compat/linux/arch/arm/linux_systrace_args.c Sun Apr 26 19:20:18 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_systrace_args.c,v 1.14 2019/11/09 23:45:07 jdolecek Exp $ */
+/* $NetBSD: linux_systrace_args.c,v 1.15 2020/04/26 19:20:18 thorpej Exp $ */
/*
* System call argument to DTrace register array converstion.
@@ -1815,20 +1815,20 @@ systrace_args(register_t sysnum, const v
*n_args = 4;
break;
}
- /* linux_sys_set_robust_list */
+ /* sys___futex_set_robust_list */
case 338: {
- const struct linux_sys_set_robust_list_args *p = params;
- uarg[0] = (intptr_t) SCARG(p, head); /* struct linux_robust_list_head * */
+ const struct sys___futex_set_robust_list_args *p = params;
+ uarg[0] = (intptr_t) SCARG(p, head); /* void * */
uarg[1] = SCARG(p, len); /* size_t */
*n_args = 2;
break;
}
- /* linux_sys_get_robust_list */
+ /* sys___futex_get_robust_list */
case 339: {
- const struct linux_sys_get_robust_list_args *p = params;
- iarg[0] = SCARG(p, pid); /* int */
- uarg[1] = (intptr_t) SCARG(p, head); /* struct linux_robust_list_head ** */
- uarg[2] = (intptr_t) SCARG(p, len); /* size_t * */
+ const struct sys___futex_get_robust_list_args *p = params;
+ iarg[0] = SCARG(p, lwpid); /* lwpid_t */
+ uarg[1] = (intptr_t) SCARG(p, headp); /* void ** */
+ uarg[2] = (intptr_t) SCARG(p, lenp); /* size_t * */
*n_args = 3;
break;
}
@@ -4869,11 +4869,11 @@ systrace_entry_setargdesc(int sysnum, in
break;
};
break;
- /* linux_sys_set_robust_list */
+ /* sys___futex_set_robust_list */
case 338:
switch(ndx) {
case 0:
- p = "struct linux_robust_list_head *";
+ p = "void *";
break;
case 1:
p = "size_t";
@@ -4882,14 +4882,14 @@ systrace_entry_setargdesc(int sysnum, in
break;
};
break;
- /* linux_sys_get_robust_list */
+ /* sys___futex_get_robust_list */
case 339:
switch(ndx) {
case 0:
- p = "int";
+ p = "lwpid_t";
break;
case 1:
- p = "struct linux_robust_list_head **";
+ p = "void **";
break;
case 2:
p = "size_t *";
@@ -6116,12 +6116,12 @@ systrace_return_setargdesc(int sysnum, i
if (ndx == 0 || ndx == 1)
p = "int";
break;
- /* linux_sys_set_robust_list */
+ /* sys___futex_set_robust_list */
case 338:
if (ndx == 0 || ndx == 1)
p = "int";
break;
- /* linux_sys_get_robust_list */
+ /* sys___futex_get_robust_list */
case 339:
if (ndx == 0 || ndx == 1)
p = "int";
Index: src/sys/compat/linux/arch/i386/linux_syscall.h
diff -u src/sys/compat/linux/arch/i386/linux_syscall.h:1.115 src/sys/compat/linux/arch/i386/linux_syscall.h:1.116
--- src/sys/compat/linux/arch/i386/linux_syscall.h:1.115 Sat Nov 9 23:45:08 2019
+++ src/sys/compat/linux/arch/i386/linux_syscall.h Sun Apr 26 19:20:18 2020
@@ -1,10 +1,10 @@
-/* $NetBSD: linux_syscall.h,v 1.115 2019/11/09 23:45:08 jdolecek Exp $ */
+/* $NetBSD: linux_syscall.h,v 1.116 2020/04/26 19:20:18 thorpej Exp $ */
/*
* System call numbers.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.123 2019/11/09 23:44:32 jdolecek Exp
+ * created from NetBSD: syscalls.master,v 1.124 2020/04/26 18:53:32 thorpej Exp
*/
#ifndef _LINUX_SYS_SYSCALL_H_
@@ -716,11 +716,11 @@
/* syscall: "ppoll" ret: "int" args: "struct pollfd *" "u_int" "struct linux_timespec *" "linux_sigset_t *" */
#define LINUX_SYS_ppoll 309
-/* syscall: "set_robust_list" ret: "int" args: "struct linux_robust_list_head *" "size_t" */
-#define LINUX_SYS_set_robust_list 311
+/* syscall: "__futex_set_robust_list" ret: "int" args: "void *" "size_t" */
+#define LINUX_SYS___futex_set_robust_list 311
-/* syscall: "get_robust_list" ret: "int" args: "int" "struct linux_robust_list_head **" "size_t *" */
-#define LINUX_SYS_get_robust_list 312
+/* syscall: "__futex_get_robust_list" ret: "int" args: "lwpid_t" "void **" "size_t *" */
+#define LINUX_SYS___futex_get_robust_list 312
/* syscall: "utimensat" ret: "int" args: "int" "const char *" "struct linux_timespec *" "int" */
#define LINUX_SYS_utimensat 320
Index: src/sys/compat/linux/arch/i386/linux_syscallargs.h
diff -u src/sys/compat/linux/arch/i386/linux_syscallargs.h:1.115 src/sys/compat/linux/arch/i386/linux_syscallargs.h:1.116
--- src/sys/compat/linux/arch/i386/linux_syscallargs.h:1.115 Sat Nov 9 23:45:08 2019
+++ src/sys/compat/linux/arch/i386/linux_syscallargs.h Sun Apr 26 19:20:18 2020
@@ -1,10 +1,10 @@
-/* $NetBSD: linux_syscallargs.h,v 1.115 2019/11/09 23:45:08 jdolecek Exp $ */
+/* $NetBSD: linux_syscallargs.h,v 1.116 2020/04/26 19:20:18 thorpej Exp $ */
/*
* System call argument lists.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.123 2019/11/09 23:44:32 jdolecek Exp
+ * created from NetBSD: syscalls.master,v 1.124 2020/04/26 18:53:32 thorpej Exp
*/
#ifndef _LINUX_SYS_SYSCALLARGS_H_
@@ -1107,18 +1107,9 @@ struct linux_sys_ppoll_args {
};
check_syscall_args(linux_sys_ppoll)
-struct linux_sys_set_robust_list_args {
- syscallarg(struct linux_robust_list_head *) head;
- syscallarg(size_t) len;
-};
-check_syscall_args(linux_sys_set_robust_list)
+struct sys___futex_set_robust_list_args;
-struct linux_sys_get_robust_list_args {
- syscallarg(int) pid;
- syscallarg(struct linux_robust_list_head **) head;
- syscallarg(size_t *) len;
-};
-check_syscall_args(linux_sys_get_robust_list)
+struct sys___futex_get_robust_list_args;
struct linux_sys_utimensat_args {
syscallarg(int) fd;
@@ -1601,9 +1592,9 @@ int linux_sys_pselect6(struct lwp *, con
int linux_sys_ppoll(struct lwp *, const struct linux_sys_ppoll_args *, register_t *);
-int linux_sys_set_robust_list(struct lwp *, const struct linux_sys_set_robust_list_args *, register_t *);
+int sys___futex_set_robust_list(struct lwp *, const struct sys___futex_set_robust_list_args *, register_t *);
-int linux_sys_get_robust_list(struct lwp *, const struct linux_sys_get_robust_list_args *, register_t *);
+int sys___futex_get_robust_list(struct lwp *, const struct sys___futex_get_robust_list_args *, register_t *);
int linux_sys_utimensat(struct lwp *, const struct linux_sys_utimensat_args *, register_t *);
Index: src/sys/compat/linux/arch/i386/linux_sysent.c
diff -u src/sys/compat/linux/arch/i386/linux_sysent.c:1.115 src/sys/compat/linux/arch/i386/linux_sysent.c:1.116
--- src/sys/compat/linux/arch/i386/linux_sysent.c:1.115 Sat Nov 9 23:45:08 2019
+++ src/sys/compat/linux/arch/i386/linux_sysent.c Sun Apr 26 19:20:18 2020
@@ -1,14 +1,14 @@
-/* $NetBSD: linux_sysent.c,v 1.115 2019/11/09 23:45:08 jdolecek Exp $ */
+/* $NetBSD: linux_sysent.c,v 1.116 2020/04/26 19:20:18 thorpej Exp $ */
/*
* System call switch table.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.123 2019/11/09 23:44:32 jdolecek Exp
+ * created from NetBSD: syscalls.master,v 1.124 2020/04/26 18:53:32 thorpej Exp
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_sysent.c,v 1.115 2019/11/09 23:45:08 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_sysent.c,v 1.116 2020/04/26 19:20:18 thorpej Exp $");
#include <sys/param.h>
#include <sys/poll.h>
@@ -1336,15 +1336,15 @@ struct sysent linux_sysent[] = {
.sy_call = linux_sys_nosys,
}, /* 310 = filler */
{
- ns(struct linux_sys_set_robust_list_args),
+ ns(struct sys___futex_set_robust_list_args),
.sy_flags = SYCALL_ARG_PTR,
- .sy_call = (sy_call_t *)linux_sys_set_robust_list
- }, /* 311 = set_robust_list */
+ .sy_call = (sy_call_t *)sys___futex_set_robust_list
+ }, /* 311 = __futex_set_robust_list */
{
- ns(struct linux_sys_get_robust_list_args),
+ ns(struct sys___futex_get_robust_list_args),
.sy_flags = SYCALL_ARG_PTR,
- .sy_call = (sy_call_t *)linux_sys_get_robust_list
- }, /* 312 = get_robust_list */
+ .sy_call = (sy_call_t *)sys___futex_get_robust_list
+ }, /* 312 = __futex_get_robust_list */
{
.sy_call = linux_sys_nosys,
}, /* 313 = filler */
Index: src/sys/compat/linux/arch/i386/linux_syscalls.c
diff -u src/sys/compat/linux/arch/i386/linux_syscalls.c:1.116 src/sys/compat/linux/arch/i386/linux_syscalls.c:1.117
--- src/sys/compat/linux/arch/i386/linux_syscalls.c:1.116 Sat Nov 9 23:45:08 2019
+++ src/sys/compat/linux/arch/i386/linux_syscalls.c Sun Apr 26 19:20:18 2020
@@ -1,14 +1,14 @@
-/* $NetBSD: linux_syscalls.c,v 1.116 2019/11/09 23:45:08 jdolecek Exp $ */
+/* $NetBSD: linux_syscalls.c,v 1.117 2020/04/26 19:20:18 thorpej Exp $ */
/*
* System call names.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.123 2019/11/09 23:44:32 jdolecek Exp
+ * created from NetBSD: syscalls.master,v 1.124 2020/04/26 18:53:32 thorpej Exp
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_syscalls.c,v 1.116 2019/11/09 23:45:08 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_syscalls.c,v 1.117 2020/04/26 19:20:18 thorpej Exp $");
#if defined(_KERNEL_OPT)
#include <sys/param.h>
@@ -345,8 +345,8 @@ const char *const linux_syscallnames[] =
/* 308 */ "pselect6",
/* 309 */ "ppoll",
/* 310 */ "#310 (unimplemented unshare)",
- /* 311 */ "set_robust_list",
- /* 312 */ "get_robust_list",
+ /* 311 */ "__futex_set_robust_list",
+ /* 312 */ "__futex_get_robust_list",
/* 313 */ "#313 (unimplemented splice)",
/* 314 */ "#314 (unimplemented sync_file_range)",
/* 315 */ "#315 (unimplemented tee)",
@@ -867,8 +867,8 @@ const char *const altlinux_syscallnames[
/* 308 */ NULL, /* pselect6 */
/* 309 */ NULL, /* ppoll */
/* 310 */ NULL, /* unimplemented unshare */
- /* 311 */ NULL, /* set_robust_list */
- /* 312 */ NULL, /* get_robust_list */
+ /* 311 */ NULL, /* __futex_set_robust_list */
+ /* 312 */ NULL, /* __futex_get_robust_list */
/* 313 */ NULL, /* unimplemented splice */
/* 314 */ NULL, /* unimplemented sync_file_range */
/* 315 */ NULL, /* unimplemented tee */
Index: src/sys/compat/linux/arch/i386/linux_systrace_args.c
diff -u src/sys/compat/linux/arch/i386/linux_systrace_args.c:1.10 src/sys/compat/linux/arch/i386/linux_systrace_args.c:1.11
--- src/sys/compat/linux/arch/i386/linux_systrace_args.c:1.10 Sat Nov 9 23:45:08 2019
+++ src/sys/compat/linux/arch/i386/linux_systrace_args.c Sun Apr 26 19:20:18 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_systrace_args.c,v 1.10 2019/11/09 23:45:08 jdolecek Exp $ */
+/* $NetBSD: linux_systrace_args.c,v 1.11 2020/04/26 19:20:18 thorpej Exp $ */
/*
* System call argument to DTrace register array converstion.
@@ -1878,20 +1878,20 @@ systrace_args(register_t sysnum, const v
*n_args = 4;
break;
}
- /* linux_sys_set_robust_list */
+ /* sys___futex_set_robust_list */
case 311: {
- const struct linux_sys_set_robust_list_args *p = params;
- uarg[0] = (intptr_t) SCARG(p, head); /* struct linux_robust_list_head * */
+ const struct sys___futex_set_robust_list_args *p = params;
+ uarg[0] = (intptr_t) SCARG(p, head); /* void * */
uarg[1] = SCARG(p, len); /* size_t */
*n_args = 2;
break;
}
- /* linux_sys_get_robust_list */
+ /* sys___futex_get_robust_list */
case 312: {
- const struct linux_sys_get_robust_list_args *p = params;
- iarg[0] = SCARG(p, pid); /* int */
- uarg[1] = (intptr_t) SCARG(p, head); /* struct linux_robust_list_head ** */
- uarg[2] = (intptr_t) SCARG(p, len); /* size_t * */
+ const struct sys___futex_get_robust_list_args *p = params;
+ iarg[0] = SCARG(p, lwpid); /* lwpid_t */
+ uarg[1] = (intptr_t) SCARG(p, headp); /* void ** */
+ uarg[2] = (intptr_t) SCARG(p, lenp); /* size_t * */
*n_args = 3;
break;
}
@@ -4981,11 +4981,11 @@ systrace_entry_setargdesc(int sysnum, in
break;
};
break;
- /* linux_sys_set_robust_list */
+ /* sys___futex_set_robust_list */
case 311:
switch(ndx) {
case 0:
- p = "struct linux_robust_list_head *";
+ p = "void *";
break;
case 1:
p = "size_t";
@@ -4994,14 +4994,14 @@ systrace_entry_setargdesc(int sysnum, in
break;
};
break;
- /* linux_sys_get_robust_list */
+ /* sys___futex_get_robust_list */
case 312:
switch(ndx) {
case 0:
- p = "int";
+ p = "lwpid_t";
break;
case 1:
- p = "struct linux_robust_list_head **";
+ p = "void **";
break;
case 2:
p = "size_t *";
@@ -6179,12 +6179,12 @@ systrace_return_setargdesc(int sysnum, i
if (ndx == 0 || ndx == 1)
p = "int";
break;
- /* linux_sys_set_robust_list */
+ /* sys___futex_set_robust_list */
case 311:
if (ndx == 0 || ndx == 1)
p = "int";
break;
- /* linux_sys_get_robust_list */
+ /* sys___futex_get_robust_list */
case 312:
if (ndx == 0 || ndx == 1)
p = "int";
Index: src/sys/compat/linux/arch/m68k/linux_syscall.h
diff -u src/sys/compat/linux/arch/m68k/linux_syscall.h:1.107 src/sys/compat/linux/arch/m68k/linux_syscall.h:1.108
--- src/sys/compat/linux/arch/m68k/linux_syscall.h:1.107 Sat Nov 9 23:45:08 2019
+++ src/sys/compat/linux/arch/m68k/linux_syscall.h Sun Apr 26 19:20:19 2020
@@ -1,10 +1,10 @@
-/* $NetBSD: linux_syscall.h,v 1.107 2019/11/09 23:45:08 jdolecek Exp $ */
+/* $NetBSD: linux_syscall.h,v 1.108 2020/04/26 19:20:19 thorpej Exp $ */
/*
* System call numbers.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.94 2019/11/09 23:44:32 jdolecek Exp
+ * created from NetBSD: syscalls.master,v 1.95 2020/04/26 18:53:32 thorpej Exp
*/
#ifndef _LINUX_SYS_SYSCALL_H_
@@ -699,11 +699,11 @@
/* syscall: "ppoll" ret: "int" args: "struct pollfd *" "u_int" "struct linux_timespec *" "linux_sigset_t *" */
#define LINUX_SYS_ppoll 302
-/* syscall: "set_robust_list" ret: "int" args: "struct linux_robust_list_head *" "size_t" */
-#define LINUX_SYS_set_robust_list 304
+/* syscall: "__futex_set_robust_list" ret: "int" args: "void *" "size_t" */
+#define LINUX_SYS___futex_set_robust_list 304
-/* syscall: "get_robust_list" ret: "int" args: "int" "struct linux_robust_list_head **" "size_t *" */
-#define LINUX_SYS_get_robust_list 305
+/* syscall: "__futex_get_robust_list" ret: "int" args: "lwpid_t" "void **" "size_t *" */
+#define LINUX_SYS___futex_get_robust_list 305
/* syscall: "sched_setaffinity" ret: "int" args: "pid_t" "unsigned int" "unsigned long *" */
#define LINUX_SYS_sched_setaffinity 311
Index: src/sys/compat/linux/arch/m68k/linux_syscalls.c
diff -u src/sys/compat/linux/arch/m68k/linux_syscalls.c:1.107 src/sys/compat/linux/arch/m68k/linux_syscalls.c:1.108
--- src/sys/compat/linux/arch/m68k/linux_syscalls.c:1.107 Sat Nov 9 23:45:08 2019
+++ src/sys/compat/linux/arch/m68k/linux_syscalls.c Sun Apr 26 19:20:19 2020
@@ -1,14 +1,14 @@
-/* $NetBSD: linux_syscalls.c,v 1.107 2019/11/09 23:45:08 jdolecek Exp $ */
+/* $NetBSD: linux_syscalls.c,v 1.108 2020/04/26 19:20:19 thorpej Exp $ */
/*
* System call names.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.94 2019/11/09 23:44:32 jdolecek Exp
+ * created from NetBSD: syscalls.master,v 1.95 2020/04/26 18:53:32 thorpej Exp
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_syscalls.c,v 1.107 2019/11/09 23:45:08 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_syscalls.c,v 1.108 2020/04/26 19:20:19 thorpej Exp $");
#if defined(_KERNEL_OPT)
#if defined(_KERNEL_OPT)
@@ -358,8 +358,8 @@ const char *const linux_syscallnames[] =
/* 301 */ "pselect6",
/* 302 */ "ppoll",
/* 303 */ "#303 (unimplemented unshare)",
- /* 304 */ "set_robust_list",
- /* 305 */ "get_robust_list",
+ /* 304 */ "__futex_set_robust_list",
+ /* 305 */ "__futex_get_robust_list",
/* 306 */ "#306 (unimplemented splice)",
/* 307 */ "#307 (unimplemented sync_file_range)",
/* 308 */ "#308 (unimplemented tee)",
@@ -896,8 +896,8 @@ const char *const altlinux_syscallnames[
/* 301 */ NULL, /* pselect6 */
/* 302 */ NULL, /* ppoll */
/* 303 */ NULL, /* unimplemented unshare */
- /* 304 */ NULL, /* set_robust_list */
- /* 305 */ NULL, /* get_robust_list */
+ /* 304 */ NULL, /* __futex_set_robust_list */
+ /* 305 */ NULL, /* __futex_get_robust_list */
/* 306 */ NULL, /* unimplemented splice */
/* 307 */ NULL, /* unimplemented sync_file_range */
/* 308 */ NULL, /* unimplemented tee */
Index: src/sys/compat/linux/arch/m68k/linux_sysent.c
diff -u src/sys/compat/linux/arch/m68k/linux_sysent.c:1.107 src/sys/compat/linux/arch/m68k/linux_sysent.c:1.108
--- src/sys/compat/linux/arch/m68k/linux_sysent.c:1.107 Sat Nov 9 23:45:08 2019
+++ src/sys/compat/linux/arch/m68k/linux_sysent.c Sun Apr 26 19:20:19 2020
@@ -1,14 +1,14 @@
-/* $NetBSD: linux_sysent.c,v 1.107 2019/11/09 23:45:08 jdolecek Exp $ */
+/* $NetBSD: linux_sysent.c,v 1.108 2020/04/26 19:20:19 thorpej Exp $ */
/*
* System call switch table.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.94 2019/11/09 23:44:32 jdolecek Exp
+ * created from NetBSD: syscalls.master,v 1.95 2020/04/26 18:53:32 thorpej Exp
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_sysent.c,v 1.107 2019/11/09 23:45:08 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_sysent.c,v 1.108 2020/04/26 19:20:19 thorpej Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -1321,15 +1321,15 @@ struct sysent linux_sysent[] = {
.sy_call = linux_sys_nosys,
}, /* 303 = filler */
{
- ns(struct linux_sys_set_robust_list_args),
+ ns(struct sys___futex_set_robust_list_args),
.sy_flags = SYCALL_ARG_PTR,
- .sy_call = (sy_call_t *)linux_sys_set_robust_list
- }, /* 304 = set_robust_list */
+ .sy_call = (sy_call_t *)sys___futex_set_robust_list
+ }, /* 304 = __futex_set_robust_list */
{
- ns(struct linux_sys_get_robust_list_args),
+ ns(struct sys___futex_get_robust_list_args),
.sy_flags = SYCALL_ARG_PTR,
- .sy_call = (sy_call_t *)linux_sys_get_robust_list
- }, /* 305 = get_robust_list */
+ .sy_call = (sy_call_t *)sys___futex_get_robust_list
+ }, /* 305 = __futex_get_robust_list */
{
.sy_call = linux_sys_nosys,
}, /* 306 = filler */
Index: src/sys/compat/linux/arch/m68k/linux_syscallargs.h
diff -u src/sys/compat/linux/arch/m68k/linux_syscallargs.h:1.106 src/sys/compat/linux/arch/m68k/linux_syscallargs.h:1.107
--- src/sys/compat/linux/arch/m68k/linux_syscallargs.h:1.106 Sat Nov 9 23:45:08 2019
+++ src/sys/compat/linux/arch/m68k/linux_syscallargs.h Sun Apr 26 19:20:19 2020
@@ -1,10 +1,10 @@
-/* $NetBSD: linux_syscallargs.h,v 1.106 2019/11/09 23:45:08 jdolecek Exp $ */
+/* $NetBSD: linux_syscallargs.h,v 1.107 2020/04/26 19:20:19 thorpej Exp $ */
/*
* System call argument lists.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.94 2019/11/09 23:44:32 jdolecek Exp
+ * created from NetBSD: syscalls.master,v 1.95 2020/04/26 18:53:32 thorpej Exp
*/
#ifndef _LINUX_SYS_SYSCALLARGS_H_
@@ -1054,18 +1054,9 @@ struct linux_sys_ppoll_args {
};
check_syscall_args(linux_sys_ppoll)
-struct linux_sys_set_robust_list_args {
- syscallarg(struct linux_robust_list_head *) head;
- syscallarg(size_t) len;
-};
-check_syscall_args(linux_sys_set_robust_list)
+struct sys___futex_set_robust_list_args;
-struct linux_sys_get_robust_list_args {
- syscallarg(int) pid;
- syscallarg(struct linux_robust_list_head **) head;
- syscallarg(size_t *) len;
-};
-check_syscall_args(linux_sys_get_robust_list)
+struct sys___futex_get_robust_list_args;
struct linux_sys_sched_setaffinity_args {
syscallarg(pid_t) pid;
@@ -1579,9 +1570,9 @@ int linux_sys_pselect6(struct lwp *, con
int linux_sys_ppoll(struct lwp *, const struct linux_sys_ppoll_args *, register_t *);
-int linux_sys_set_robust_list(struct lwp *, const struct linux_sys_set_robust_list_args *, register_t *);
+int sys___futex_set_robust_list(struct lwp *, const struct sys___futex_set_robust_list_args *, register_t *);
-int linux_sys_get_robust_list(struct lwp *, const struct linux_sys_get_robust_list_args *, register_t *);
+int sys___futex_get_robust_list(struct lwp *, const struct sys___futex_get_robust_list_args *, register_t *);
int linux_sys_sched_setaffinity(struct lwp *, const struct linux_sys_sched_setaffinity_args *, register_t *);
Index: src/sys/compat/linux/arch/mips/linux_syscall.h
diff -u src/sys/compat/linux/arch/mips/linux_syscall.h:1.79 src/sys/compat/linux/arch/mips/linux_syscall.h:1.80
--- src/sys/compat/linux/arch/mips/linux_syscall.h:1.79 Sat Nov 9 23:45:08 2019
+++ src/sys/compat/linux/arch/mips/linux_syscall.h Sun Apr 26 19:20:19 2020
@@ -1,10 +1,10 @@
-/* $NetBSD: linux_syscall.h,v 1.79 2019/11/09 23:45:08 jdolecek Exp $ */
+/* $NetBSD: linux_syscall.h,v 1.80 2020/04/26 19:20:19 thorpej Exp $ */
/*
* System call numbers.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.67 2019/11/09 23:44:32 jdolecek Exp
+ * created from NetBSD: syscalls.master,v 1.68 2020/04/26 18:53:32 thorpej Exp
*/
#ifndef _LINUX_SYS_SYSCALL_H_
@@ -673,11 +673,11 @@
/* syscall: "ppoll" ret: "int" args: "struct pollfd *" "u_int" "struct linux_timespec *" "linux_sigset_t *" */
#define LINUX_SYS_ppoll 302
-/* syscall: "set_robust_list" ret: "int" args: "struct linux_robust_list_head *" "size_t" */
-#define LINUX_SYS_set_robust_list 309
+/* syscall: "__futex_set_robust_list" ret: "int" args: "void *" "size_t" */
+#define LINUX_SYS___futex_set_robust_list 309
-/* syscall: "get_robust_list" ret: "int" args: "int" "struct linux_robust_list_head **" "size_t *" */
-#define LINUX_SYS_get_robust_list 310
+/* syscall: "__futex_get_robust_list" ret: "int" args: "lwpid_t" "void **" "size_t *" */
+#define LINUX_SYS___futex_get_robust_list 310
/* syscall: "utimensat" ret: "int" args: "int" "const char *" "struct linux_timespec *" "int" */
#define LINUX_SYS_utimensat 316
Index: src/sys/compat/linux/arch/mips/linux_syscallargs.h
diff -u src/sys/compat/linux/arch/mips/linux_syscallargs.h:1.78 src/sys/compat/linux/arch/mips/linux_syscallargs.h:1.79
--- src/sys/compat/linux/arch/mips/linux_syscallargs.h:1.78 Sat Nov 9 23:45:08 2019
+++ src/sys/compat/linux/arch/mips/linux_syscallargs.h Sun Apr 26 19:20:19 2020
@@ -1,10 +1,10 @@
-/* $NetBSD: linux_syscallargs.h,v 1.78 2019/11/09 23:45:08 jdolecek Exp $ */
+/* $NetBSD: linux_syscallargs.h,v 1.79 2020/04/26 19:20:19 thorpej Exp $ */
/*
* System call argument lists.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.67 2019/11/09 23:44:32 jdolecek Exp
+ * created from NetBSD: syscalls.master,v 1.68 2020/04/26 18:53:32 thorpej Exp
*/
#ifndef _LINUX_SYS_SYSCALLARGS_H_
@@ -1106,18 +1106,9 @@ struct linux_sys_ppoll_args {
};
check_syscall_args(linux_sys_ppoll)
-struct linux_sys_set_robust_list_args {
- syscallarg(struct linux_robust_list_head *) head;
- syscallarg(size_t) len;
-};
-check_syscall_args(linux_sys_set_robust_list)
+struct sys___futex_set_robust_list_args;
-struct linux_sys_get_robust_list_args {
- syscallarg(int) pid;
- syscallarg(struct linux_robust_list_head **) head;
- syscallarg(size_t *) len;
-};
-check_syscall_args(linux_sys_get_robust_list)
+struct sys___futex_get_robust_list_args;
struct linux_sys_utimensat_args {
syscallarg(int) fd;
@@ -1615,9 +1606,9 @@ int linux_sys_pselect6(struct lwp *, con
int linux_sys_ppoll(struct lwp *, const struct linux_sys_ppoll_args *, register_t *);
-int linux_sys_set_robust_list(struct lwp *, const struct linux_sys_set_robust_list_args *, register_t *);
+int sys___futex_set_robust_list(struct lwp *, const struct sys___futex_set_robust_list_args *, register_t *);
-int linux_sys_get_robust_list(struct lwp *, const struct linux_sys_get_robust_list_args *, register_t *);
+int sys___futex_get_robust_list(struct lwp *, const struct sys___futex_get_robust_list_args *, register_t *);
int linux_sys_utimensat(struct lwp *, const struct linux_sys_utimensat_args *, register_t *);
Index: src/sys/compat/linux/arch/mips/linux_syscalls.c
diff -u src/sys/compat/linux/arch/mips/linux_syscalls.c:1.78 src/sys/compat/linux/arch/mips/linux_syscalls.c:1.79
--- src/sys/compat/linux/arch/mips/linux_syscalls.c:1.78 Sat Nov 9 23:45:08 2019
+++ src/sys/compat/linux/arch/mips/linux_syscalls.c Sun Apr 26 19:20:19 2020
@@ -1,14 +1,14 @@
-/* $NetBSD: linux_syscalls.c,v 1.78 2019/11/09 23:45:08 jdolecek Exp $ */
+/* $NetBSD: linux_syscalls.c,v 1.79 2020/04/26 19:20:19 thorpej Exp $ */
/*
* System call names.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.67 2019/11/09 23:44:32 jdolecek Exp
+ * created from NetBSD: syscalls.master,v 1.68 2020/04/26 18:53:32 thorpej Exp
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_syscalls.c,v 1.78 2019/11/09 23:45:08 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_syscalls.c,v 1.79 2020/04/26 19:20:19 thorpej Exp $");
#if defined(_KERNEL_OPT)
#include <sys/param.h>
@@ -339,8 +339,8 @@ const char *const linux_syscallnames[] =
/* 306 */ "#306 (unimplemented tee)",
/* 307 */ "#307 (unimplemented vmsplice)",
/* 308 */ "#308 (unimplemented move_pages)",
- /* 309 */ "set_robust_list",
- /* 310 */ "get_robust_list",
+ /* 309 */ "__futex_set_robust_list",
+ /* 310 */ "__futex_get_robust_list",
/* 311 */ "#311 (unimplemented kexec_load)",
/* 312 */ "#312 (unimplemented getcpu)",
/* 313 */ "#313 (unimplemented epoll_pwait)",
@@ -856,8 +856,8 @@ const char *const altlinux_syscallnames[
/* 306 */ NULL, /* unimplemented tee */
/* 307 */ NULL, /* unimplemented vmsplice */
/* 308 */ NULL, /* unimplemented move_pages */
- /* 309 */ NULL, /* set_robust_list */
- /* 310 */ NULL, /* get_robust_list */
+ /* 309 */ NULL, /* __futex_set_robust_list */
+ /* 310 */ NULL, /* __futex_get_robust_list */
/* 311 */ NULL, /* unimplemented kexec_load */
/* 312 */ NULL, /* unimplemented getcpu */
/* 313 */ NULL, /* unimplemented epoll_pwait */
Index: src/sys/compat/linux/arch/mips/linux_sysent.c
diff -u src/sys/compat/linux/arch/mips/linux_sysent.c:1.78 src/sys/compat/linux/arch/mips/linux_sysent.c:1.79
--- src/sys/compat/linux/arch/mips/linux_sysent.c:1.78 Sat Nov 9 23:45:08 2019
+++ src/sys/compat/linux/arch/mips/linux_sysent.c Sun Apr 26 19:20:19 2020
@@ -1,14 +1,14 @@
-/* $NetBSD: linux_sysent.c,v 1.78 2019/11/09 23:45:08 jdolecek Exp $ */
+/* $NetBSD: linux_sysent.c,v 1.79 2020/04/26 19:20:19 thorpej Exp $ */
/*
* System call switch table.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.67 2019/11/09 23:44:32 jdolecek Exp
+ * created from NetBSD: syscalls.master,v 1.68 2020/04/26 18:53:32 thorpej Exp
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_sysent.c,v 1.78 2019/11/09 23:45:08 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_sysent.c,v 1.79 2020/04/26 19:20:19 thorpej Exp $");
#include <sys/param.h>
#include <sys/poll.h>
@@ -1318,15 +1318,15 @@ struct sysent linux_sysent[] = {
.sy_call = linux_sys_nosys,
}, /* 308 = filler */
{
- ns(struct linux_sys_set_robust_list_args),
+ ns(struct sys___futex_set_robust_list_args),
.sy_flags = SYCALL_ARG_PTR,
- .sy_call = (sy_call_t *)linux_sys_set_robust_list
- }, /* 309 = set_robust_list */
+ .sy_call = (sy_call_t *)sys___futex_set_robust_list
+ }, /* 309 = __futex_set_robust_list */
{
- ns(struct linux_sys_get_robust_list_args),
+ ns(struct sys___futex_get_robust_list_args),
.sy_flags = SYCALL_ARG_PTR,
- .sy_call = (sy_call_t *)linux_sys_get_robust_list
- }, /* 310 = get_robust_list */
+ .sy_call = (sy_call_t *)sys___futex_get_robust_list
+ }, /* 310 = __futex_get_robust_list */
{
.sy_call = linux_sys_nosys,
}, /* 311 = filler */
Index: src/sys/compat/linux/arch/powerpc/linux_syscall.h
diff -u src/sys/compat/linux/arch/powerpc/linux_syscall.h:1.85 src/sys/compat/linux/arch/powerpc/linux_syscall.h:1.86
--- src/sys/compat/linux/arch/powerpc/linux_syscall.h:1.85 Sat Nov 9 23:45:08 2019
+++ src/sys/compat/linux/arch/powerpc/linux_syscall.h Sun Apr 26 19:20:19 2020
@@ -1,10 +1,10 @@
-/* $NetBSD: linux_syscall.h,v 1.85 2019/11/09 23:45:08 jdolecek Exp $ */
+/* $NetBSD: linux_syscall.h,v 1.86 2020/04/26 19:20:19 thorpej Exp $ */
/*
* System call numbers.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.73 2019/11/09 23:44:32 jdolecek Exp
+ * created from NetBSD: syscalls.master,v 1.74 2020/04/26 18:53:32 thorpej Exp
*/
#ifndef _LINUX_SYS_SYSCALL_H_
@@ -642,11 +642,11 @@
/* syscall: "faccessat" ret: "int" args: "int" "const char *" "int" */
#define LINUX_SYS_faccessat 298
-/* syscall: "set_robust_list" ret: "int" args: "struct linux_robust_list_head *" "size_t" */
-#define LINUX_SYS_set_robust_list 299
+/* syscall: "__futex_set_robust_list" ret: "int" args: "void *" "size_t" */
+#define LINUX_SYS___futex_set_robust_list 299
-/* syscall: "get_robust_list" ret: "int" args: "int" "struct linux_robust_list_head **" "size_t *" */
-#define LINUX_SYS_get_robust_list 300
+/* syscall: "__futex_get_robust_list" ret: "int" args: "lwpid_t" "void **" "size_t *" */
+#define LINUX_SYS___futex_get_robust_list 300
/* syscall: "utimensat" ret: "int" args: "int" "const char *" "struct linux_timespec *" "int" */
#define LINUX_SYS_utimensat 304
Index: src/sys/compat/linux/arch/powerpc/linux_sysent.c
diff -u src/sys/compat/linux/arch/powerpc/linux_sysent.c:1.85 src/sys/compat/linux/arch/powerpc/linux_sysent.c:1.86
--- src/sys/compat/linux/arch/powerpc/linux_sysent.c:1.85 Sat Nov 9 23:45:08 2019
+++ src/sys/compat/linux/arch/powerpc/linux_sysent.c Sun Apr 26 19:20:19 2020
@@ -1,14 +1,14 @@
-/* $NetBSD: linux_sysent.c,v 1.85 2019/11/09 23:45:08 jdolecek Exp $ */
+/* $NetBSD: linux_sysent.c,v 1.86 2020/04/26 19:20:19 thorpej Exp $ */
/*
* System call switch table.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.73 2019/11/09 23:44:32 jdolecek Exp
+ * created from NetBSD: syscalls.master,v 1.74 2020/04/26 18:53:32 thorpej Exp
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_sysent.c,v 1.85 2019/11/09 23:45:08 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_sysent.c,v 1.86 2020/04/26 19:20:19 thorpej Exp $");
#include <sys/param.h>
#include <sys/poll.h>
@@ -1267,15 +1267,15 @@ struct sysent linux_sysent[] = {
.sy_call = (sy_call_t *)linux_sys_faccessat
}, /* 298 = faccessat */
{
- ns(struct linux_sys_set_robust_list_args),
+ ns(struct sys___futex_set_robust_list_args),
.sy_flags = SYCALL_ARG_PTR,
- .sy_call = (sy_call_t *)linux_sys_set_robust_list
- }, /* 299 = set_robust_list */
+ .sy_call = (sy_call_t *)sys___futex_set_robust_list
+ }, /* 299 = __futex_set_robust_list */
{
- ns(struct linux_sys_get_robust_list_args),
+ ns(struct sys___futex_get_robust_list_args),
.sy_flags = SYCALL_ARG_PTR,
- .sy_call = (sy_call_t *)linux_sys_get_robust_list
- }, /* 300 = get_robust_list */
+ .sy_call = (sy_call_t *)sys___futex_get_robust_list
+ }, /* 300 = __futex_get_robust_list */
{
.sy_call = linux_sys_nosys,
}, /* 301 = filler */
Index: src/sys/compat/linux/arch/powerpc/linux_syscallargs.h
diff -u src/sys/compat/linux/arch/powerpc/linux_syscallargs.h:1.84 src/sys/compat/linux/arch/powerpc/linux_syscallargs.h:1.85
--- src/sys/compat/linux/arch/powerpc/linux_syscallargs.h:1.84 Sat Nov 9 23:45:08 2019
+++ src/sys/compat/linux/arch/powerpc/linux_syscallargs.h Sun Apr 26 19:20:19 2020
@@ -1,10 +1,10 @@
-/* $NetBSD: linux_syscallargs.h,v 1.84 2019/11/09 23:45:08 jdolecek Exp $ */
+/* $NetBSD: linux_syscallargs.h,v 1.85 2020/04/26 19:20:19 thorpej Exp $ */
/*
* System call argument lists.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.73 2019/11/09 23:44:32 jdolecek Exp
+ * created from NetBSD: syscalls.master,v 1.74 2020/04/26 18:53:32 thorpej Exp
*/
#ifndef _LINUX_SYS_SYSCALLARGS_H_
@@ -993,18 +993,9 @@ struct linux_sys_faccessat_args {
};
check_syscall_args(linux_sys_faccessat)
-struct linux_sys_set_robust_list_args {
- syscallarg(struct linux_robust_list_head *) head;
- syscallarg(size_t) len;
-};
-check_syscall_args(linux_sys_set_robust_list)
+struct sys___futex_set_robust_list_args;
-struct linux_sys_get_robust_list_args {
- syscallarg(int) pid;
- syscallarg(struct linux_robust_list_head **) head;
- syscallarg(size_t *) len;
-};
-check_syscall_args(linux_sys_get_robust_list)
+struct sys___futex_get_robust_list_args;
struct linux_sys_utimensat_args {
syscallarg(int) fd;
@@ -1478,9 +1469,9 @@ int linux_sys_fchmodat(struct lwp *, con
int linux_sys_faccessat(struct lwp *, const struct linux_sys_faccessat_args *, register_t *);
-int linux_sys_set_robust_list(struct lwp *, const struct linux_sys_set_robust_list_args *, register_t *);
+int sys___futex_set_robust_list(struct lwp *, const struct sys___futex_set_robust_list_args *, register_t *);
-int linux_sys_get_robust_list(struct lwp *, const struct linux_sys_get_robust_list_args *, register_t *);
+int sys___futex_get_robust_list(struct lwp *, const struct sys___futex_get_robust_list_args *, register_t *);
int linux_sys_utimensat(struct lwp *, const struct linux_sys_utimensat_args *, register_t *);
Index: src/sys/compat/linux/arch/powerpc/linux_syscalls.c
diff -u src/sys/compat/linux/arch/powerpc/linux_syscalls.c:1.84 src/sys/compat/linux/arch/powerpc/linux_syscalls.c:1.85
--- src/sys/compat/linux/arch/powerpc/linux_syscalls.c:1.84 Sat Nov 9 23:45:08 2019
+++ src/sys/compat/linux/arch/powerpc/linux_syscalls.c Sun Apr 26 19:20:19 2020
@@ -1,14 +1,14 @@
-/* $NetBSD: linux_syscalls.c,v 1.84 2019/11/09 23:45:08 jdolecek Exp $ */
+/* $NetBSD: linux_syscalls.c,v 1.85 2020/04/26 19:20:19 thorpej Exp $ */
/*
* System call names.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.73 2019/11/09 23:44:32 jdolecek Exp
+ * created from NetBSD: syscalls.master,v 1.74 2020/04/26 18:53:32 thorpej Exp
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_syscalls.c,v 1.84 2019/11/09 23:45:08 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_syscalls.c,v 1.85 2020/04/26 19:20:19 thorpej Exp $");
#if defined(_KERNEL_OPT)
#include <sys/param.h>
@@ -332,8 +332,8 @@ const char *const linux_syscallnames[] =
/* 296 */ "readlinkat",
/* 297 */ "fchmodat",
/* 298 */ "faccessat",
- /* 299 */ "set_robust_list",
- /* 300 */ "get_robust_list",
+ /* 299 */ "__futex_set_robust_list",
+ /* 300 */ "__futex_get_robust_list",
/* 301 */ "#301 (unimplemented move_pages)",
/* 302 */ "#302 (unimplemented getcpu)",
/* 303 */ "#303 (unimplemented epoll_wait)",
@@ -854,8 +854,8 @@ const char *const altlinux_syscallnames[
/* 296 */ NULL, /* readlinkat */
/* 297 */ NULL, /* fchmodat */
/* 298 */ NULL, /* faccessat */
- /* 299 */ NULL, /* set_robust_list */
- /* 300 */ NULL, /* get_robust_list */
+ /* 299 */ NULL, /* __futex_set_robust_list */
+ /* 300 */ NULL, /* __futex_get_robust_list */
/* 301 */ NULL, /* unimplemented move_pages */
/* 302 */ NULL, /* unimplemented getcpu */
/* 303 */ NULL, /* unimplemented epoll_wait */
