diff --git a/sys/compat/linux/arch/alpha/linux_syscall.h b/sys/compat/linux/arch/alpha/linux_syscall.h
index 878e27a2b85c..14de2094e8ff 100644
--- a/sys/compat/linux/arch/alpha/linux_syscall.h
+++ b/sys/compat/linux/arch/alpha/linux_syscall.h
@@ -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
diff --git a/sys/compat/linux/arch/alpha/linux_syscallargs.h b/sys/compat/linux/arch/alpha/linux_syscallargs.h
index 128cd3f4049d..3d2bb4b79605 100644
--- a/sys/compat/linux/arch/alpha/linux_syscallargs.h
+++ b/sys/compat/linux/arch/alpha/linux_syscallargs.h
@@ -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 *, const struct linux_sys_pselect6_args *, reg
 
 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 *);
 
diff --git a/sys/compat/linux/arch/alpha/linux_syscalls.c b/sys/compat/linux/arch/alpha/linux_syscalls.c
index 439f91d4c54d..684cf5dd854d 100644
--- a/sys/compat/linux/arch/alpha/linux_syscalls.c
+++ b/sys/compat/linux/arch/alpha/linux_syscalls.c
@@ -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 */
diff --git a/sys/compat/linux/arch/alpha/linux_sysent.c b/sys/compat/linux/arch/alpha/linux_sysent.c
index a3414e0ebb1a..77f66b5e7a93 100644
--- a/sys/compat/linux/arch/alpha/linux_sysent.c
+++ b/sys/compat/linux/arch/alpha/linux_sysent.c
@@ -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 */
diff --git a/sys/compat/linux/arch/amd64/linux_syscall.h b/sys/compat/linux/arch/amd64/linux_syscall.h
index 0dbbfe2644d3..b8dc722dcc42 100644
--- a/sys/compat/linux/arch/amd64/linux_syscall.h
+++ b/sys/compat/linux/arch/amd64/linux_syscall.h
@@ -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
diff --git a/sys/compat/linux/arch/amd64/linux_syscallargs.h b/sys/compat/linux/arch/amd64/linux_syscallargs.h
index 2caf325bd7d8..841d012eb4ca 100644
--- a/sys/compat/linux/arch/amd64/linux_syscallargs.h
+++ b/sys/compat/linux/arch/amd64/linux_syscallargs.h
@@ -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 *, const struct linux_sys_pselect6_args *, reg
 
 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 *);
 
diff --git a/sys/compat/linux/arch/amd64/linux_syscalls.c b/sys/compat/linux/arch/amd64/linux_syscalls.c
index 51382b4fe433..966e84f75e91 100644
--- a/sys/compat/linux/arch/amd64/linux_syscalls.c
+++ b/sys/compat/linux/arch/amd64/linux_syscalls.c
@@ -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 */
diff --git a/sys/compat/linux/arch/amd64/linux_sysent.c b/sys/compat/linux/arch/amd64/linux_sysent.c
index 993aa55e1f8f..233c32cc73af 100644
--- a/sys/compat/linux/arch/amd64/linux_sysent.c
+++ b/sys/compat/linux/arch/amd64/linux_sysent.c
@@ -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 */
diff --git a/sys/compat/linux/arch/amd64/linux_systrace_args.c b/sys/compat/linux/arch/amd64/linux_systrace_args.c
index 0c9744fc5f68..7c69b3fb5e0d 100644
--- a/sys/compat/linux/arch/amd64/linux_systrace_args.c
+++ b/sys/compat/linux/arch/amd64/linux_systrace_args.c
@@ -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 void *params, uintptr_t *uarg, size_t *n_
 		*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, int ndx, char *desc, size_t descsz)
 			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, int ndx, char *desc, size_t descsz)
 			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, int ndx, char *desc, size_t descsz)
 		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";
diff --git a/sys/compat/linux/arch/arm/linux_syscall.h b/sys/compat/linux/arch/arm/linux_syscall.h
index 08959584df66..e5136a89ae26 100644
--- a/sys/compat/linux/arch/arm/linux_syscall.h
+++ b/sys/compat/linux/arch/arm/linux_syscall.h
@@ -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
diff --git a/sys/compat/linux/arch/arm/linux_syscallargs.h b/sys/compat/linux/arch/arm/linux_syscallargs.h
index 2e7c3be23bdd..33abd733f806 100644
--- a/sys/compat/linux/arch/arm/linux_syscallargs.h
+++ b/sys/compat/linux/arch/arm/linux_syscallargs.h
@@ -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 *, const struct linux_sys_pselect6_args *, reg
 
 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 *);
 
diff --git a/sys/compat/linux/arch/arm/linux_syscalls.c b/sys/compat/linux/arch/arm/linux_syscalls.c
index 39b4d6e89f90..960160cb591e 100644
--- a/sys/compat/linux/arch/arm/linux_syscalls.c
+++ b/sys/compat/linux/arch/arm/linux_syscalls.c
@@ -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 */
diff --git a/sys/compat/linux/arch/arm/linux_sysent.c b/sys/compat/linux/arch/arm/linux_sysent.c
index b1d9786f8df1..cd0e27b719f4 100644
--- a/sys/compat/linux/arch/arm/linux_sysent.c
+++ b/sys/compat/linux/arch/arm/linux_sysent.c
@@ -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 */
diff --git a/sys/compat/linux/arch/arm/linux_systrace_args.c b/sys/compat/linux/arch/arm/linux_systrace_args.c
index 55058d6b2958..741860c5a7ad 100644
--- a/sys/compat/linux/arch/arm/linux_systrace_args.c
+++ b/sys/compat/linux/arch/arm/linux_systrace_args.c
@@ -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 void *params, uintptr_t *uarg, size_t *n_
 		*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, int ndx, char *desc, size_t descsz)
 			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, int ndx, char *desc, size_t descsz)
 			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, int ndx, char *desc, size_t descsz)
 		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";
diff --git a/sys/compat/linux/arch/i386/linux_syscall.h b/sys/compat/linux/arch/i386/linux_syscall.h
index 493fffd30b69..f976a98f799d 100644
--- a/sys/compat/linux/arch/i386/linux_syscall.h
+++ b/sys/compat/linux/arch/i386/linux_syscall.h
@@ -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
diff --git a/sys/compat/linux/arch/i386/linux_syscallargs.h b/sys/compat/linux/arch/i386/linux_syscallargs.h
index ed8d6828fa57..359ecd08fb79 100644
--- a/sys/compat/linux/arch/i386/linux_syscallargs.h
+++ b/sys/compat/linux/arch/i386/linux_syscallargs.h
@@ -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 *, const struct linux_sys_pselect6_args *, reg
 
 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 *);
 
diff --git a/sys/compat/linux/arch/i386/linux_syscalls.c b/sys/compat/linux/arch/i386/linux_syscalls.c
index 9809af67e141..09d55519eaa0 100644
--- a/sys/compat/linux/arch/i386/linux_syscalls.c
+++ b/sys/compat/linux/arch/i386/linux_syscalls.c
@@ -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 */
diff --git a/sys/compat/linux/arch/i386/linux_sysent.c b/sys/compat/linux/arch/i386/linux_sysent.c
index 1f0e17aee215..18609762ee3d 100644
--- a/sys/compat/linux/arch/i386/linux_sysent.c
+++ b/sys/compat/linux/arch/i386/linux_sysent.c
@@ -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 */
diff --git a/sys/compat/linux/arch/i386/linux_systrace_args.c b/sys/compat/linux/arch/i386/linux_systrace_args.c
index 731fa49ba704..72f8d72b99c0 100644
--- a/sys/compat/linux/arch/i386/linux_systrace_args.c
+++ b/sys/compat/linux/arch/i386/linux_systrace_args.c
@@ -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 void *params, uintptr_t *uarg, size_t *n_
 		*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, int ndx, char *desc, size_t descsz)
 			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, int ndx, char *desc, size_t descsz)
 			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, int ndx, char *desc, size_t descsz)
 		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";
diff --git a/sys/compat/linux/arch/m68k/linux_syscall.h b/sys/compat/linux/arch/m68k/linux_syscall.h
index 6838b229bdf3..d6b9e42ab4fa 100644
--- a/sys/compat/linux/arch/m68k/linux_syscall.h
+++ b/sys/compat/linux/arch/m68k/linux_syscall.h
@@ -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
diff --git a/sys/compat/linux/arch/m68k/linux_syscallargs.h b/sys/compat/linux/arch/m68k/linux_syscallargs.h
index 63ac6a56f66e..7e7427cfb63f 100644
--- a/sys/compat/linux/arch/m68k/linux_syscallargs.h
+++ b/sys/compat/linux/arch/m68k/linux_syscallargs.h
@@ -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 *, const struct linux_sys_pselect6_args *, reg
 
 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 *);
 
diff --git a/sys/compat/linux/arch/m68k/linux_syscalls.c b/sys/compat/linux/arch/m68k/linux_syscalls.c
index a3f0fb576c93..b2e2350c85fd 100644
--- a/sys/compat/linux/arch/m68k/linux_syscalls.c
+++ b/sys/compat/linux/arch/m68k/linux_syscalls.c
@@ -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 */
diff --git a/sys/compat/linux/arch/m68k/linux_sysent.c b/sys/compat/linux/arch/m68k/linux_sysent.c
index 774d7840f71a..990bfc855e69 100644
--- a/sys/compat/linux/arch/m68k/linux_sysent.c
+++ b/sys/compat/linux/arch/m68k/linux_sysent.c
@@ -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 */
diff --git a/sys/compat/linux/arch/mips/linux_syscall.h b/sys/compat/linux/arch/mips/linux_syscall.h
index 48521e1738ed..2d6825a435c9 100644
--- a/sys/compat/linux/arch/mips/linux_syscall.h
+++ b/sys/compat/linux/arch/mips/linux_syscall.h
@@ -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
diff --git a/sys/compat/linux/arch/mips/linux_syscallargs.h b/sys/compat/linux/arch/mips/linux_syscallargs.h
index 247943b33b94..9eb01986499c 100644
--- a/sys/compat/linux/arch/mips/linux_syscallargs.h
+++ b/sys/compat/linux/arch/mips/linux_syscallargs.h
@@ -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 *, const struct linux_sys_pselect6_args *, reg
 
 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 *);
 
diff --git a/sys/compat/linux/arch/mips/linux_syscalls.c b/sys/compat/linux/arch/mips/linux_syscalls.c
index 13ef4590b892..21f0875c7a33 100644
--- a/sys/compat/linux/arch/mips/linux_syscalls.c
+++ b/sys/compat/linux/arch/mips/linux_syscalls.c
@@ -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 */
diff --git a/sys/compat/linux/arch/mips/linux_sysent.c b/sys/compat/linux/arch/mips/linux_sysent.c
index e056e5d7c9b7..17094a0ad19a 100644
--- a/sys/compat/linux/arch/mips/linux_sysent.c
+++ b/sys/compat/linux/arch/mips/linux_sysent.c
@@ -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 */
diff --git a/sys/compat/linux/arch/powerpc/linux_syscall.h b/sys/compat/linux/arch/powerpc/linux_syscall.h
index a82ab5363b5c..82f33b2d85f6 100644
--- a/sys/compat/linux/arch/powerpc/linux_syscall.h
+++ b/sys/compat/linux/arch/powerpc/linux_syscall.h
@@ -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
diff --git a/sys/compat/linux/arch/powerpc/linux_syscallargs.h b/sys/compat/linux/arch/powerpc/linux_syscallargs.h
index 454822c3858e..9d35ed51b665 100644
--- a/sys/compat/linux/arch/powerpc/linux_syscallargs.h
+++ b/sys/compat/linux/arch/powerpc/linux_syscallargs.h
@@ -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 *, const struct linux_sys_fchmodat_args *, reg
 
 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 *);
 
diff --git a/sys/compat/linux/arch/powerpc/linux_syscalls.c b/sys/compat/linux/arch/powerpc/linux_syscalls.c
index e6b5948dd490..7d93a19b3924 100644
--- a/sys/compat/linux/arch/powerpc/linux_syscalls.c
+++ b/sys/compat/linux/arch/powerpc/linux_syscalls.c
@@ -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 */
diff --git a/sys/compat/linux/arch/powerpc/linux_sysent.c b/sys/compat/linux/arch/powerpc/linux_sysent.c
index d8dcbaeb260c..3a32f259a8ae 100644
--- a/sys/compat/linux/arch/powerpc/linux_sysent.c
+++ b/sys/compat/linux/arch/powerpc/linux_sysent.c
@@ -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 */
diff --git a/sys/compat/linux32/arch/amd64/linux32_syscall.h b/sys/compat/linux32/arch/amd64/linux32_syscall.h
index be8946117173..5c8dc1d08010 100644
--- a/sys/compat/linux32/arch/amd64/linux32_syscall.h
+++ b/sys/compat/linux32/arch/amd64/linux32_syscall.h
@@ -1,10 +1,10 @@
-/* $NetBSD: linux32_syscall.h,v 1.80 2019/11/09 23:45:08 jdolecek Exp $ */
+/* $NetBSD: linux32_syscall.h,v 1.81 2020/04/26 19:20:58 thorpej Exp $ */
 
 /*
  * System call numbers.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	NetBSD: syscalls.master,v 1.70 2019/11/09 23:44:31 jdolecek Exp
+ * created from	NetBSD: syscalls.master,v 1.71 2020/04/26 18:53:33 thorpej Exp
  */
 
 #ifndef _LINUX32_SYS_SYSCALL_H_
@@ -693,11 +693,11 @@
 /* syscall: "ppoll" ret: "int" args: "netbsd32_pollfdp_t" "u_int" "linux32_timespecp_t" "linux32_sigsetp_t" */
 #define	LINUX32_SYS_ppoll	309
 
-/* syscall: "set_robust_list" ret: "int" args: "linux32_robust_list_headp_t" "linux32_size_t" */
-#define	LINUX32_SYS_set_robust_list	311
+/* syscall: "netbsd32___futex_set_robust_list" ret: "int" args: "netbsd32_voidp" "netbsd32_size_t" */
+#define	LINUX32_SYS_netbsd32___futex_set_robust_list	311
 
-/* syscall: "get_robust_list" ret: "int" args: "linux32_pid_t" "linux32_robust_list_headpp_t" "linux32_sizep_t" */
-#define	LINUX32_SYS_get_robust_list	312
+/* syscall: "netbsd32___futex_get_robust_list" ret: "int" args: "lwpid_t" "netbsd32_voidp" "netbsd32_size_tp" */
+#define	LINUX32_SYS_netbsd32___futex_get_robust_list	312
 
 /* syscall: "utimensat" ret: "int" args: "int" "netbsd32_charp" "linux32_timespecp_t" "int" */
 #define	LINUX32_SYS_utimensat	320
diff --git a/sys/compat/linux32/arch/amd64/linux32_syscallargs.h b/sys/compat/linux32/arch/amd64/linux32_syscallargs.h
index 61d44f50eae3..37a0e6cbfd55 100644
--- a/sys/compat/linux32/arch/amd64/linux32_syscallargs.h
+++ b/sys/compat/linux32/arch/amd64/linux32_syscallargs.h
@@ -1,10 +1,10 @@
-/* $NetBSD: linux32_syscallargs.h,v 1.80 2019/11/09 23:45:08 jdolecek Exp $ */
+/* $NetBSD: linux32_syscallargs.h,v 1.81 2020/04/26 19:20:58 thorpej Exp $ */
 
 /*
  * System call argument lists.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	NetBSD: syscalls.master,v 1.70 2019/11/09 23:44:31 jdolecek Exp
+ * created from	NetBSD: syscalls.master,v 1.71 2020/04/26 18:53:33 thorpej Exp
  */
 
 #ifndef _LINUX32_SYS_SYSCALLARGS_H_
@@ -992,18 +992,9 @@ struct linux32_sys_ppoll_args {
 };
 check_syscall_args(linux32_sys_ppoll)
 
-struct linux32_sys_set_robust_list_args {
-	syscallarg(linux32_robust_list_headp_t) head;
-	syscallarg(linux32_size_t) len;
-};
-check_syscall_args(linux32_sys_set_robust_list)
+struct netbsd32___futex_set_robust_list_args;
 
-struct linux32_sys_get_robust_list_args {
-	syscallarg(linux32_pid_t) pid;
-	syscallarg(linux32_robust_list_headpp_t) head;
-	syscallarg(linux32_sizep_t) len;
-};
-check_syscall_args(linux32_sys_get_robust_list)
+struct netbsd32___futex_get_robust_list_args;
 
 struct linux32_sys_utimensat_args {
 	syscallarg(int) fd;
@@ -1470,9 +1461,9 @@ int	linux32_sys_faccessat(struct lwp *, const struct linux32_sys_faccessat_args
 
 int	linux32_sys_ppoll(struct lwp *, const struct linux32_sys_ppoll_args *, register_t *);
 
-int	linux32_sys_set_robust_list(struct lwp *, const struct linux32_sys_set_robust_list_args *, register_t *);
+int	netbsd32___futex_set_robust_list(struct lwp *, const struct netbsd32___futex_set_robust_list_args *, register_t *);
 
-int	linux32_sys_get_robust_list(struct lwp *, const struct linux32_sys_get_robust_list_args *, register_t *);
+int	netbsd32___futex_get_robust_list(struct lwp *, const struct netbsd32___futex_get_robust_list_args *, register_t *);
 
 int	linux32_sys_utimensat(struct lwp *, const struct linux32_sys_utimensat_args *, register_t *);
 
diff --git a/sys/compat/linux32/arch/amd64/linux32_syscalls.c b/sys/compat/linux32/arch/amd64/linux32_syscalls.c
index 8053cd6d39e8..f45c9254be16 100644
--- a/sys/compat/linux32/arch/amd64/linux32_syscalls.c
+++ b/sys/compat/linux32/arch/amd64/linux32_syscalls.c
@@ -1,14 +1,14 @@
-/* $NetBSD: linux32_syscalls.c,v 1.80 2019/11/09 23:45:08 jdolecek Exp $ */
+/* $NetBSD: linux32_syscalls.c,v 1.81 2020/04/26 19:20:58 thorpej Exp $ */
 
 /*
  * System call names.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	NetBSD: syscalls.master,v 1.70 2019/11/09 23:44:31 jdolecek Exp
+ * created from	NetBSD: syscalls.master,v 1.71 2020/04/26 18:53:33 thorpej Exp
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux32_syscalls.c,v 1.80 2019/11/09 23:45:08 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux32_syscalls.c,v 1.81 2020/04/26 19:20:58 thorpej Exp $");
 
 #if defined(_KERNEL_OPT)
 #include <sys/param.h>
@@ -350,8 +350,8 @@ const char *const linux32_syscallnames[] = {
 	/* 308 */	"#308 (unimplemented pselect6)",
 	/* 309 */	"ppoll",
 	/* 310 */	"#310 (unimplemented unshare)",
-	/* 311 */	"set_robust_list",
-	/* 312 */	"get_robust_list",
+	/* 311 */	"netbsd32___futex_set_robust_list",
+	/* 312 */	"netbsd32___futex_get_robust_list",
 	/* 313 */	"#313 (unimplemented splice)",
 	/* 314 */	"#314 (unimplemented sync_file_range)",
 	/* 315 */	"#315 (unimplemented tee)",
@@ -869,8 +869,8 @@ const char *const altlinux32_syscallnames[] = {
 	/* 308 */	NULL, /* unimplemented pselect6 */
 	/* 309 */	NULL, /* ppoll */
 	/* 310 */	NULL, /* unimplemented unshare */
-	/* 311 */	NULL, /* set_robust_list */
-	/* 312 */	NULL, /* get_robust_list */
+	/* 311 */	"__futex_set_robust_list",
+	/* 312 */	"__futex_get_robust_list",
 	/* 313 */	NULL, /* unimplemented splice */
 	/* 314 */	NULL, /* unimplemented sync_file_range */
 	/* 315 */	NULL, /* unimplemented tee */
diff --git a/sys/compat/linux32/arch/amd64/linux32_sysent.c b/sys/compat/linux32/arch/amd64/linux32_sysent.c
index 1ab29ca94929..7c1fb8f924d0 100644
--- a/sys/compat/linux32/arch/amd64/linux32_sysent.c
+++ b/sys/compat/linux32/arch/amd64/linux32_sysent.c
@@ -1,14 +1,14 @@
-/* $NetBSD: linux32_sysent.c,v 1.80 2019/11/09 23:45:08 jdolecek Exp $ */
+/* $NetBSD: linux32_sysent.c,v 1.81 2020/04/26 19:20:58 thorpej Exp $ */
 
 /*
  * System call switch table.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	NetBSD: syscalls.master,v 1.70 2019/11/09 23:44:31 jdolecek Exp
+ * created from	NetBSD: syscalls.master,v 1.71 2020/04/26 18:53:33 thorpej Exp
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux32_sysent.c,v 1.80 2019/11/09 23:45:08 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux32_sysent.c,v 1.81 2020/04/26 19:20:58 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/poll.h>
@@ -1177,13 +1177,13 @@ struct sysent linux32_sysent[] = {
 		.sy_call = linux_sys_nosys,
 	},		/* 310 = filler */
 	{
-		ns(struct linux32_sys_set_robust_list_args),
-		.sy_call = (sy_call_t *)linux32_sys_set_robust_list
-	},		/* 311 = set_robust_list */
+		ns(struct netbsd32___futex_set_robust_list_args),
+		.sy_call = (sy_call_t *)netbsd32___futex_set_robust_list
+	},		/* 311 = netbsd32___futex_set_robust_list */
 	{
-		ns(struct linux32_sys_get_robust_list_args),
-		.sy_call = (sy_call_t *)linux32_sys_get_robust_list
-	},		/* 312 = get_robust_list */
+		ns(struct netbsd32___futex_get_robust_list_args),
+		.sy_call = (sy_call_t *)netbsd32___futex_get_robust_list
+	},		/* 312 = netbsd32___futex_get_robust_list */
 	{
 		.sy_call = linux_sys_nosys,
 	},		/* 313 = filler */
diff --git a/sys/compat/linux32/arch/amd64/linux32_systrace_args.c b/sys/compat/linux32/arch/amd64/linux32_systrace_args.c
index ef15cff75651..95bc1e5b6190 100644
--- a/sys/compat/linux32/arch/amd64/linux32_systrace_args.c
+++ b/sys/compat/linux32/arch/amd64/linux32_systrace_args.c
@@ -1,4 +1,4 @@
-/* $NetBSD: linux32_systrace_args.c,v 1.7 2019/11/09 23:45:08 jdolecek Exp $ */
+/* $NetBSD: linux32_systrace_args.c,v 1.8 2020/04/26 19:20:58 thorpej Exp $ */
 
 /*
  * System call argument to DTrace register array converstion.
@@ -1820,20 +1820,20 @@ systrace_args(register_t sysnum, const void *params, uintptr_t *uarg, size_t *n_
 		*n_args = 4;
 		break;
 	}
-	/* linux32_sys_set_robust_list */
+	/* netbsd32___futex_set_robust_list */
 	case 311: {
-		const struct linux32_sys_set_robust_list_args *p = params;
-		uarg[0] = (intptr_t) SCARG(p, head).i32; /* linux32_robust_list_headp_t */
-		iarg[1] = SCARG(p, len); /* linux32_size_t */
+		const struct netbsd32___futex_set_robust_list_args *p = params;
+		uarg[0] = (intptr_t) SCARG(p, head).i32; /* netbsd32_voidp */
+		iarg[1] = SCARG(p, len); /* netbsd32_size_t */
 		*n_args = 2;
 		break;
 	}
-	/* linux32_sys_get_robust_list */
+	/* netbsd32___futex_get_robust_list */
 	case 312: {
-		const struct linux32_sys_get_robust_list_args *p = params;
-		iarg[0] = SCARG(p, pid); /* linux32_pid_t */
-		uarg[1] = (intptr_t) SCARG(p, head).i32; /* linux32_robust_list_headpp_t */
-		uarg[2] = (intptr_t) SCARG(p, len).i32; /* linux32_sizep_t */
+		const struct netbsd32___futex_get_robust_list_args *p = params;
+		iarg[0] = SCARG(p, lwpid); /* lwpid_t */
+		uarg[1] = (intptr_t) SCARG(p, headp).i32; /* netbsd32_voidp */
+		uarg[2] = (intptr_t) SCARG(p, lenp).i32; /* netbsd32_size_tp */
 		*n_args = 3;
 		break;
 	}
@@ -4830,30 +4830,30 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
 			break;
 		};
 		break;
-	/* linux32_sys_set_robust_list */
+	/* netbsd32___futex_set_robust_list */
 	case 311:
 		switch(ndx) {
 		case 0:
-			p = "linux32_robust_list_headp_t";
+			p = "netbsd32_voidp";
 			break;
 		case 1:
-			p = "linux32_size_t";
+			p = "netbsd32_size_t";
 			break;
 		default:
 			break;
 		};
 		break;
-	/* linux32_sys_get_robust_list */
+	/* netbsd32___futex_get_robust_list */
 	case 312:
 		switch(ndx) {
 		case 0:
-			p = "linux32_pid_t";
+			p = "lwpid_t";
 			break;
 		case 1:
-			p = "linux32_robust_list_headpp_t";
+			p = "netbsd32_voidp";
 			break;
 		case 2:
-			p = "linux32_sizep_t";
+			p = "netbsd32_size_tp";
 			break;
 		default:
 			break;
@@ -5991,12 +5991,12 @@ systrace_return_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
 		if (ndx == 0 || ndx == 1)
 			p = "int";
 		break;
-	/* linux32_sys_set_robust_list */
+	/* netbsd32___futex_set_robust_list */
 	case 311:
 		if (ndx == 0 || ndx == 1)
 			p = "int";
 		break;
-	/* linux32_sys_get_robust_list */
+	/* netbsd32___futex_get_robust_list */
 	case 312:
 		if (ndx == 0 || ndx == 1)
 			p = "int";
diff --git a/sys/compat/netbsd32/netbsd32_syscall.h b/sys/compat/netbsd32/netbsd32_syscall.h
index d0d50615115f..ccc4c68031d2 100644
--- a/sys/compat/netbsd32/netbsd32_syscall.h
+++ b/sys/compat/netbsd32/netbsd32_syscall.h
@@ -1,10 +1,10 @@
-/* $NetBSD: netbsd32_syscall.h,v 1.152 2020/04/22 21:25:17 thorpej Exp $ */
+/* $NetBSD: netbsd32_syscall.h,v 1.153 2020/04/26 19:18:52 thorpej Exp $ */
 
 /*
  * System call numbers.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	NetBSD: syscalls.master,v 1.135 2020/04/22 21:22:21 thorpej Exp
+ * created from	NetBSD: syscalls.master,v 1.137 2020/04/26 19:18:36 thorpej Exp
  */
 
 #ifndef _NETBSD32_SYS_SYSCALL_H_
@@ -462,6 +462,15 @@
 /* syscall: "netbsd32_sysarch" ret: "int" args: "int" "netbsd32_voidp" */
 #define	NETBSD32_SYS_netbsd32_sysarch	165
 
+/* syscall: "netbsd32___futex" ret: "int" args: "netbsd32_intp" "int" "int" "const netbsd32_timespecp_t" "netbsd32_intp" "int" "int" */
+#define	NETBSD32_SYS_netbsd32___futex	166
+
+/* syscall: "netbsd32___futex_set_robust_list" ret: "int" args: "netbsd32_voidp" "netbsd32_size_t" */
+#define	NETBSD32_SYS_netbsd32___futex_set_robust_list	167
+
+/* syscall: "netbsd32___futex_get_robust_list" ret: "int" args: "lwpid_t" "netbsd32_voidp" "netbsd32_size_tp" */
+#define	NETBSD32_SYS_netbsd32___futex_get_robust_list	168
+
 /* syscall: "compat_10_osemsys" ret: "int" args: "int" "int" "int" "int" "int" */
 #define	NETBSD32_SYS_compat_10_osemsys	169
 
diff --git a/sys/compat/netbsd32/netbsd32_syscallargs.h b/sys/compat/netbsd32/netbsd32_syscallargs.h
index 7915c38781c8..e6807165a82c 100644
--- a/sys/compat/netbsd32/netbsd32_syscallargs.h
+++ b/sys/compat/netbsd32/netbsd32_syscallargs.h
@@ -1,10 +1,10 @@
-/* $NetBSD: netbsd32_syscallargs.h,v 1.151 2020/04/22 21:25:17 thorpej Exp $ */
+/* $NetBSD: netbsd32_syscallargs.h,v 1.152 2020/04/26 19:18:52 thorpej Exp $ */
 
 /*
  * System call argument lists.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	NetBSD: syscalls.master,v 1.135 2020/04/22 21:22:21 thorpej Exp
+ * created from	NetBSD: syscalls.master,v 1.137 2020/04/26 19:18:36 thorpej Exp
  */
 
 #ifndef _NETBSD32_SYS_SYSCALLARGS_H_
@@ -864,6 +864,30 @@ struct netbsd32_sysarch_args {
 };
 check_syscall_args(netbsd32_sysarch)
 
+struct netbsd32___futex_args {
+	syscallarg(netbsd32_intp) uaddr;
+	syscallarg(int) op;
+	syscallarg(int) val;
+	syscallarg(const netbsd32_timespecp_t) timeout;
+	syscallarg(netbsd32_intp) uaddr2;
+	syscallarg(int) val2;
+	syscallarg(int) val3;
+};
+check_syscall_args(netbsd32___futex)
+
+struct netbsd32___futex_set_robust_list_args {
+	syscallarg(netbsd32_voidp) head;
+	syscallarg(netbsd32_size_t) len;
+};
+check_syscall_args(netbsd32___futex_set_robust_list)
+
+struct netbsd32___futex_get_robust_list_args {
+	syscallarg(lwpid_t) lwpid;
+	syscallarg(netbsd32_voidp) headp;
+	syscallarg(netbsd32_size_tp) lenp;
+};
+check_syscall_args(netbsd32___futex_get_robust_list)
+
 struct compat_10_netbsd32_semsys_args {
 	syscallarg(int) which;
 	syscallarg(int) a2;
@@ -2941,6 +2965,12 @@ int	compat_09_netbsd32_uname(struct lwp *, const struct compat_09_netbsd32_uname
 
 int	netbsd32_sysarch(struct lwp *, const struct netbsd32_sysarch_args *, register_t *);
 
+int	netbsd32___futex(struct lwp *, const struct netbsd32___futex_args *, register_t *);
+
+int	netbsd32___futex_set_robust_list(struct lwp *, const struct netbsd32___futex_set_robust_list_args *, register_t *);
+
+int	netbsd32___futex_get_robust_list(struct lwp *, const struct netbsd32___futex_get_robust_list_args *, register_t *);
+
 int	compat_10_netbsd32_semsys(struct lwp *, const struct compat_10_netbsd32_semsys_args *, register_t *);
 
 int	compat_10_netbsd32_msgsys(struct lwp *, const struct compat_10_netbsd32_msgsys_args *, register_t *);
diff --git a/sys/compat/netbsd32/netbsd32_syscalls.c b/sys/compat/netbsd32/netbsd32_syscalls.c
index f344b780bcf6..8724c630b32b 100644
--- a/sys/compat/netbsd32/netbsd32_syscalls.c
+++ b/sys/compat/netbsd32/netbsd32_syscalls.c
@@ -1,14 +1,14 @@
-/* $NetBSD: netbsd32_syscalls.c,v 1.151 2020/04/22 21:25:18 thorpej Exp $ */
+/* $NetBSD: netbsd32_syscalls.c,v 1.152 2020/04/26 19:18:52 thorpej Exp $ */
 
 /*
  * System call names.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	NetBSD: syscalls.master,v 1.135 2020/04/22 21:22:21 thorpej Exp
+ * created from	NetBSD: syscalls.master,v 1.137 2020/04/26 19:18:36 thorpej Exp
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls.c,v 1.151 2020/04/22 21:25:18 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls.c,v 1.152 2020/04/26 19:18:52 thorpej Exp $");
 
 #if defined(_KERNEL_OPT)
 #if defined(_KERNEL_OPT)
@@ -196,9 +196,9 @@ const char *const netbsd32_syscallnames[] = {
 	/* 163 */	"compat_09_netbsd32_osetdomainname",
 	/* 164 */	"compat_09_netbsd32_uname",
 	/* 165 */	"netbsd32_sysarch",
-	/* 166 */	"#166 (unimplemented)",
-	/* 167 */	"#167 (unimplemented)",
-	/* 168 */	"#168 (unimplemented)",
+	/* 166 */	"netbsd32___futex",
+	/* 167 */	"netbsd32___futex_set_robust_list",
+	/* 168 */	"netbsd32___futex_get_robust_list",
 	/* 169 */	"compat_10_osemsys",
 	/* 170 */	"compat_10_omsgsys",
 	/* 171 */	"compat_10_oshmsys",
@@ -721,9 +721,9 @@ const char *const altnetbsd32_syscallnames[] = {
 	/* 163 */	NULL, /* compat_09_netbsd32_osetdomainname */
 	/* 164 */	NULL, /* compat_09_netbsd32_uname */
 	/* 165 */	"sysarch",
-	/* 166 */	NULL, /* unimplemented */
-	/* 167 */	NULL, /* unimplemented */
-	/* 168 */	NULL, /* unimplemented */
+	/* 166 */	"__futex",
+	/* 167 */	"__futex_set_robust_list",
+	/* 168 */	"__futex_get_robust_list",
 	/* 169 */	NULL, /* compat_10_osemsys */
 	/* 170 */	NULL, /* compat_10_omsgsys */
 	/* 171 */	NULL, /* compat_10_oshmsys */
diff --git a/sys/compat/netbsd32/netbsd32_syscalls_autoload.c b/sys/compat/netbsd32/netbsd32_syscalls_autoload.c
index a229d3a1f2b2..4f96637710b7 100644
--- a/sys/compat/netbsd32/netbsd32_syscalls_autoload.c
+++ b/sys/compat/netbsd32/netbsd32_syscalls_autoload.c
@@ -1,14 +1,14 @@
-/* $NetBSD: netbsd32_syscalls_autoload.c,v 1.31 2020/04/22 21:25:18 thorpej Exp $ */
+/* $NetBSD: netbsd32_syscalls_autoload.c,v 1.32 2020/04/26 19:18:52 thorpej Exp $ */
 
 /*
  * System call autoload table.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	NetBSD: syscalls.master,v 1.135 2020/04/22 21:22:21 thorpej Exp
+ * created from	NetBSD: syscalls.master,v 1.137 2020/04/26 19:18:36 thorpej Exp
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls_autoload.c,v 1.31 2020/04/22 21:25:18 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls_autoload.c,v 1.32 2020/04/26 19:18:52 thorpej Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_compat_netbsd.h"
diff --git a/sys/compat/netbsd32/netbsd32_sysent.c b/sys/compat/netbsd32/netbsd32_sysent.c
index 4ce4456f0677..7fe7f9e5b2c7 100644
--- a/sys/compat/netbsd32/netbsd32_sysent.c
+++ b/sys/compat/netbsd32/netbsd32_sysent.c
@@ -1,14 +1,14 @@
-/* $NetBSD: netbsd32_sysent.c,v 1.150 2020/04/22 21:25:18 thorpej Exp $ */
+/* $NetBSD: netbsd32_sysent.c,v 1.151 2020/04/26 19:18:52 thorpej Exp $ */
 
 /*
  * System call switch table.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * created from	NetBSD: syscalls.master,v 1.135 2020/04/22 21:22:21 thorpej Exp
+ * created from	NetBSD: syscalls.master,v 1.137 2020/04/26 19:18:36 thorpej Exp
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_sysent.c,v 1.150 2020/04/22 21:25:18 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_sysent.c,v 1.151 2020/04/26 19:18:52 thorpej Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_compat_netbsd.h"
@@ -761,14 +761,17 @@ struct sysent netbsd32_sysent[] = {
 		.sy_call = (sy_call_t *)netbsd32_sysarch
 	},		/* 165 = netbsd32_sysarch */
 	{
-		.sy_call = sys_nosys,
-	},		/* 166 = filler */
+		ns(struct netbsd32___futex_args),
+		.sy_call = (sy_call_t *)netbsd32___futex
+	},		/* 166 = netbsd32___futex */
 	{
-		.sy_call = sys_nosys,
-	},		/* 167 = filler */
+		ns(struct netbsd32___futex_set_robust_list_args),
+		.sy_call = (sy_call_t *)netbsd32___futex_set_robust_list
+	},		/* 167 = netbsd32___futex_set_robust_list */
 	{
-		.sy_call = sys_nosys,
-	},		/* 168 = filler */
+		ns(struct netbsd32___futex_get_robust_list_args),
+		.sy_call = (sy_call_t *)netbsd32___futex_get_robust_list
+	},		/* 168 = netbsd32___futex_get_robust_list */
 	{
 		ns(struct compat_10_netbsd32_semsys_args),
 		.sy_call = (sy_call_t *)sys_nomodule
diff --git a/sys/compat/netbsd32/netbsd32_systrace_args.c b/sys/compat/netbsd32/netbsd32_systrace_args.c
index e9862caa02cd..21a37ee6c6aa 100644
--- a/sys/compat/netbsd32/netbsd32_systrace_args.c
+++ b/sys/compat/netbsd32/netbsd32_systrace_args.c
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_systrace_args.c,v 1.42 2020/04/22 21:25:18 thorpej Exp $ */
+/* $NetBSD: netbsd32_systrace_args.c,v 1.43 2020/04/26 19:18:52 thorpej Exp $ */
 
 /*
  * System call argument to DTrace register array converstion.
@@ -1186,6 +1186,36 @@ systrace_args(register_t sysnum, const void *params, uintptr_t *uarg, size_t *n_
 		*n_args = 2;
 		break;
 	}
+	/* netbsd32___futex */
+	case 166: {
+		const struct netbsd32___futex_args *p = params;
+		uarg[0] = (intptr_t) SCARG(p, uaddr).i32; /* netbsd32_intp */
+		iarg[1] = SCARG(p, op); /* int */
+		iarg[2] = SCARG(p, val); /* int */
+		uarg[3] = (intptr_t) SCARG(p, timeout).i32; /* const netbsd32_timespecp_t */
+		uarg[4] = (intptr_t) SCARG(p, uaddr2).i32; /* netbsd32_intp */
+		iarg[5] = SCARG(p, val2); /* int */
+		iarg[6] = SCARG(p, val3); /* int */
+		*n_args = 7;
+		break;
+	}
+	/* netbsd32___futex_set_robust_list */
+	case 167: {
+		const struct netbsd32___futex_set_robust_list_args *p = params;
+		uarg[0] = (intptr_t) SCARG(p, head).i32; /* netbsd32_voidp */
+		iarg[1] = SCARG(p, len); /* netbsd32_size_t */
+		*n_args = 2;
+		break;
+	}
+	/* netbsd32___futex_get_robust_list */
+	case 168: {
+		const struct netbsd32___futex_get_robust_list_args *p = params;
+		iarg[0] = SCARG(p, lwpid); /* lwpid_t */
+		uarg[1] = (intptr_t) SCARG(p, headp).i32; /* netbsd32_voidp */
+		uarg[2] = (intptr_t) SCARG(p, lenp).i32; /* netbsd32_size_tp */
+		*n_args = 3;
+		break;
+	}
 	/* netbsd32_semsys */
 	case 169: {
 		const struct compat_10_netbsd32_semsys_args *p = params;
@@ -5427,6 +5457,63 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
 			break;
 		};
 		break;
+	/* netbsd32___futex */
+	case 166:
+		switch(ndx) {
+		case 0:
+			p = "netbsd32_intp";
+			break;
+		case 1:
+			p = "int";
+			break;
+		case 2:
+			p = "int";
+			break;
+		case 3:
+			p = "const netbsd32_timespecp_t";
+			break;
+		case 4:
+			p = "netbsd32_intp";
+			break;
+		case 5:
+			p = "int";
+			break;
+		case 6:
+			p = "int";
+			break;
+		default:
+			break;
+		};
+		break;
+	/* netbsd32___futex_set_robust_list */
+	case 167:
+		switch(ndx) {
+		case 0:
+			p = "netbsd32_voidp";
+			break;
+		case 1:
+			p = "netbsd32_size_t";
+			break;
+		default:
+			break;
+		};
+		break;
+	/* netbsd32___futex_get_robust_list */
+	case 168:
+		switch(ndx) {
+		case 0:
+			p = "lwpid_t";
+			break;
+		case 1:
+			p = "netbsd32_voidp";
+			break;
+		case 2:
+			p = "netbsd32_size_tp";
+			break;
+		default:
+			break;
+		};
+		break;
 	/* netbsd32_semsys */
 	case 169:
 		switch(ndx) {
@@ -10200,6 +10287,21 @@ systrace_return_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
 		if (ndx == 0 || ndx == 1)
 			p = "int";
 		break;
+	/* netbsd32___futex */
+	case 166:
+		if (ndx == 0 || ndx == 1)
+			p = "int";
+		break;
+	/* netbsd32___futex_set_robust_list */
+	case 167:
+		if (ndx == 0 || ndx == 1)
+			p = "int";
+		break;
+	/* netbsd32___futex_get_robust_list */
+	case 168:
+		if (ndx == 0 || ndx == 1)
+			p = "int";
+		break;
 	/* netbsd32_semsys */
 	case 169:
 		if (ndx == 0 || ndx == 1)