Module Name: src
Committed By: christos
Date: Mon May 20 01:40:45 UTC 2024
Modified Files:
src/sys/compat/netbsd32: netbsd32_syscall.h netbsd32_syscallargs.h
netbsd32_syscalls.c netbsd32_syscalls_autoload.c netbsd32_sysent.c
netbsd32_systrace_args.c
src/sys/kern: init_sysent.c syscalls.c syscalls_autoload.c
systrace_args.c
src/sys/rump: rump.sysmap
src/sys/rump/include/rump: rump_syscalls.h
src/sys/rump/librump/rumpkern: rump_syscalls.c rumpkern_syscalls.c
src/sys/rump/librump/rumpnet: rumpnet_syscalls.c
src/sys/rump/librump/rumpvfs: rumpvfs_syscalls.c
src/sys/sys: syscall.h syscallargs.h
Log Message:
regen
To generate a diff of this commit:
cvs rdiff -u -r1.161 -r1.162 src/sys/compat/netbsd32/netbsd32_syscall.h \
src/sys/compat/netbsd32/netbsd32_sysent.c
cvs rdiff -u -r1.160 -r1.161 src/sys/compat/netbsd32/netbsd32_syscallargs.h \
src/sys/compat/netbsd32/netbsd32_syscalls.c
cvs rdiff -u -r1.40 -r1.41 \
src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c
cvs rdiff -u -r1.53 -r1.54 src/sys/compat/netbsd32/netbsd32_systrace_args.c
cvs rdiff -u -r1.342 -r1.343 src/sys/kern/init_sysent.c
cvs rdiff -u -r1.330 -r1.331 src/sys/kern/syscalls.c
cvs rdiff -u -r1.46 -r1.47 src/sys/kern/syscalls_autoload.c
cvs rdiff -u -r1.52 -r1.53 src/sys/kern/systrace_args.c
cvs rdiff -u -r1.10 -r1.11 src/sys/rump/rump.sysmap
cvs rdiff -u -r1.129 -r1.130 src/sys/rump/include/rump/rump_syscalls.h
cvs rdiff -u -r1.160 -r1.161 src/sys/rump/librump/rumpkern/rump_syscalls.c
cvs rdiff -u -r1.10 -r1.11 src/sys/rump/librump/rumpkern/rumpkern_syscalls.c
cvs rdiff -u -r1.9 -r1.10 src/sys/rump/librump/rumpnet/rumpnet_syscalls.c
cvs rdiff -u -r1.11 -r1.12 src/sys/rump/librump/rumpvfs/rumpvfs_syscalls.c
cvs rdiff -u -r1.325 -r1.326 src/sys/sys/syscall.h
cvs rdiff -u -r1.308 -r1.309 src/sys/sys/syscallargs.h
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/netbsd32/netbsd32_syscall.h
diff -u src/sys/compat/netbsd32/netbsd32_syscall.h:1.161 src/sys/compat/netbsd32/netbsd32_syscall.h:1.162
--- src/sys/compat/netbsd32/netbsd32_syscall.h:1.161 Sun May 19 18:27:15 2024
+++ src/sys/compat/netbsd32/netbsd32_syscall.h Sun May 19 21:40:45 2024
@@ -1,10 +1,10 @@
-/* $NetBSD: netbsd32_syscall.h,v 1.161 2024/05/19 22:27:15 christos Exp $ */
+/* $NetBSD: netbsd32_syscall.h,v 1.162 2024/05/20 01:40:45 christos Exp $ */
/*
* System call numbers.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.145 2024/05/19 22:25:48 christos Exp
+ * created from NetBSD: syscalls.master,v 1.146 2024/05/20 01:30:33 christos Exp
*/
#ifndef _NETBSD32_SYS_SYSCALL_H_
@@ -1200,8 +1200,8 @@
/* syscall: "netbsd32_pipe2" ret: "int" args: "netbsd32_intp" "int" */
#define NETBSD32_SYS_netbsd32_pipe2 453
-/* syscall: "compat_110_netbsd32_dup3" ret: "int" args: "int" "int" "int" */
-#define NETBSD32_SYS_compat_110_netbsd32_dup3 454
+/* syscall: "compat_100_netbsd32_dup3" ret: "int" args: "int" "int" "int" */
+#define NETBSD32_SYS_compat_100_netbsd32_dup3 454
/* syscall: "netbsd32_kqueue1" ret: "int" args: "int" */
#define NETBSD32_SYS_netbsd32_kqueue1 455
@@ -1353,8 +1353,8 @@
/* syscall: "netbsd32_epoll_pwait2" ret: "int" args: "int" "netbsd32_epoll_eventp_t" "int" "netbsd32_timespecp_t" "netbsd32_sigsetp_t" */
#define NETBSD32_SYS_netbsd32_epoll_pwait2 504
-/* syscall: "netbsd32___dup3110" ret: "int" args: "int" "int" "int" */
-#define NETBSD32_SYS_netbsd32___dup3110 505
+/* syscall: "netbsd32___dup3100" ret: "int" args: "int" "int" "int" */
+#define NETBSD32_SYS_netbsd32___dup3100 505
#define NETBSD32_SYS_MAXSYSCALL 506
#define NETBSD32_SYS_NSYSENT 512
Index: src/sys/compat/netbsd32/netbsd32_sysent.c
diff -u src/sys/compat/netbsd32/netbsd32_sysent.c:1.161 src/sys/compat/netbsd32/netbsd32_sysent.c:1.162
--- src/sys/compat/netbsd32/netbsd32_sysent.c:1.161 Sun May 19 18:27:15 2024
+++ src/sys/compat/netbsd32/netbsd32_sysent.c Sun May 19 21:40:45 2024
@@ -1,14 +1,14 @@
-/* $NetBSD: netbsd32_sysent.c,v 1.161 2024/05/19 22:27:15 christos Exp $ */
+/* $NetBSD: netbsd32_sysent.c,v 1.162 2024/05/20 01:40:45 christos Exp $ */
/*
* System call switch table.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.145 2024/05/19 22:25:48 christos Exp
+ * created from NetBSD: syscalls.master,v 1.146 2024/05/20 01:30:33 christos Exp
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_sysent.c,v 1.161 2024/05/19 22:27:15 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_sysent.c,v 1.162 2024/05/20 01:40:45 christos Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -1891,9 +1891,9 @@ struct sysent netbsd32_sysent[] = {
.sy_call = (sy_call_t *)netbsd32_pipe2
}, /* 453 = netbsd32_pipe2 */
{
- ns(struct compat_110_netbsd32_dup3_args),
+ ns(struct compat_100_netbsd32_dup3_args),
.sy_call = (sy_call_t *)sys_nomodule
- }, /* 454 = compat_110_netbsd32_dup3 */
+ }, /* 454 = compat_100_netbsd32_dup3 */
{
ns(struct netbsd32_kqueue1_args),
.sy_call = (sy_call_t *)netbsd32_kqueue1
@@ -2098,9 +2098,9 @@ struct sysent netbsd32_sysent[] = {
.sy_call = (sy_call_t *)netbsd32_epoll_pwait2
}, /* 504 = netbsd32_epoll_pwait2 */
{
- ns(struct netbsd32___dup3110_args),
- .sy_call = (sy_call_t *)netbsd32___dup3110
- }, /* 505 = netbsd32___dup3110 */
+ ns(struct netbsd32___dup3100_args),
+ .sy_call = (sy_call_t *)netbsd32___dup3100
+ }, /* 505 = netbsd32___dup3100 */
{
.sy_call = sys_nosys,
}, /* 506 = filler */
Index: src/sys/compat/netbsd32/netbsd32_syscallargs.h
diff -u src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.160 src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.161
--- src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.160 Sun May 19 18:27:15 2024
+++ src/sys/compat/netbsd32/netbsd32_syscallargs.h Sun May 19 21:40:45 2024
@@ -1,10 +1,10 @@
-/* $NetBSD: netbsd32_syscallargs.h,v 1.160 2024/05/19 22:27:15 christos Exp $ */
+/* $NetBSD: netbsd32_syscallargs.h,v 1.161 2024/05/20 01:40:45 christos Exp $ */
/*
* System call argument lists.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.145 2024/05/19 22:25:48 christos Exp
+ * created from NetBSD: syscalls.master,v 1.146 2024/05/20 01:30:33 christos Exp
*/
#ifndef _NETBSD32_SYS_SYSCALLARGS_H_
@@ -2444,12 +2444,12 @@ struct netbsd32_pipe2_args {
};
check_syscall_args(netbsd32_pipe2)
-struct compat_110_netbsd32_dup3_args {
+struct compat_100_netbsd32_dup3_args {
syscallarg(int) from;
syscallarg(int) to;
syscallarg(int) flags;
};
-check_syscall_args(compat_110_netbsd32_dup3)
+check_syscall_args(compat_100_netbsd32_dup3)
struct netbsd32_kqueue1_args {
syscallarg(int) flags;
@@ -2827,12 +2827,12 @@ struct netbsd32_epoll_pwait2_args {
};
check_syscall_args(netbsd32_epoll_pwait2)
-struct netbsd32___dup3110_args {
+struct netbsd32___dup3100_args {
syscallarg(int) from;
syscallarg(int) to;
syscallarg(int) flags;
};
-check_syscall_args(netbsd32___dup3110)
+check_syscall_args(netbsd32___dup3100)
/*
* System call prototypes.
@@ -3612,7 +3612,7 @@ int netbsd32___fhstat50(struct lwp *, co
int netbsd32_pipe2(struct lwp *, const struct netbsd32_pipe2_args *, register_t *);
-int compat_110_netbsd32_dup3(struct lwp *, const struct compat_110_netbsd32_dup3_args *, register_t *);
+int compat_100_netbsd32_dup3(struct lwp *, const struct compat_100_netbsd32_dup3_args *, register_t *);
int netbsd32_kqueue1(struct lwp *, const struct netbsd32_kqueue1_args *, register_t *);
@@ -3714,6 +3714,6 @@ int netbsd32_epoll_ctl(struct lwp *, con
int netbsd32_epoll_pwait2(struct lwp *, const struct netbsd32_epoll_pwait2_args *, register_t *);
-int netbsd32___dup3110(struct lwp *, const struct netbsd32___dup3110_args *, register_t *);
+int netbsd32___dup3100(struct lwp *, const struct netbsd32___dup3100_args *, register_t *);
#endif /* _NETBSD32_SYS_SYSCALLARGS_H_ */
Index: src/sys/compat/netbsd32/netbsd32_syscalls.c
diff -u src/sys/compat/netbsd32/netbsd32_syscalls.c:1.160 src/sys/compat/netbsd32/netbsd32_syscalls.c:1.161
--- src/sys/compat/netbsd32/netbsd32_syscalls.c:1.160 Sun May 19 18:27:15 2024
+++ src/sys/compat/netbsd32/netbsd32_syscalls.c Sun May 19 21:40:45 2024
@@ -1,14 +1,14 @@
-/* $NetBSD: netbsd32_syscalls.c,v 1.160 2024/05/19 22:27:15 christos Exp $ */
+/* $NetBSD: netbsd32_syscalls.c,v 1.161 2024/05/20 01:40:45 christos Exp $ */
/*
* System call names.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.145 2024/05/19 22:25:48 christos Exp
+ * created from NetBSD: syscalls.master,v 1.146 2024/05/20 01:30:33 christos Exp
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls.c,v 1.160 2024/05/19 22:27:15 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls.c,v 1.161 2024/05/20 01:40:45 christos Exp $");
#if defined(_KERNEL_OPT)
#if defined(_KERNEL_OPT)
@@ -492,7 +492,7 @@ const char *const netbsd32_syscallnames[
/* 451 */ "netbsd32___fhstat50",
/* 452 */ "#452 (obsolete 5.99 quotactl)",
/* 453 */ "netbsd32_pipe2",
- /* 454 */ "compat_110_netbsd32_dup3",
+ /* 454 */ "compat_100_netbsd32_dup3",
/* 455 */ "netbsd32_kqueue1",
/* 456 */ "netbsd32_paccept",
/* 457 */ "netbsd32_linkat",
@@ -543,7 +543,7 @@ const char *const netbsd32_syscallnames[
/* 502 */ "netbsd32_epoll_create1",
/* 503 */ "netbsd32_epoll_ctl",
/* 504 */ "netbsd32_epoll_pwait2",
- /* 505 */ "netbsd32___dup3110",
+ /* 505 */ "netbsd32___dup3100",
/* 506 */ "# filler",
/* 507 */ "# filler",
/* 508 */ "# filler",
@@ -1017,7 +1017,7 @@ const char *const altnetbsd32_syscallnam
/* 451 */ "fhstat",
/* 452 */ NULL, /* obsolete 5.99 quotactl */
/* 453 */ "pipe2",
- /* 454 */ NULL, /* compat_110_netbsd32_dup3 */
+ /* 454 */ NULL, /* compat_100_netbsd32_dup3 */
/* 455 */ "kqueue1",
/* 456 */ "paccept",
/* 457 */ "linkat",
Index: src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c
diff -u src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c:1.40 src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c:1.41
--- src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c:1.40 Sun May 19 18:27:15 2024
+++ src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c Sun May 19 21:40:45 2024
@@ -1,14 +1,14 @@
-/* $NetBSD: netbsd32_syscalls_autoload.c,v 1.40 2024/05/19 22:27:15 christos Exp $ */
+/* $NetBSD: netbsd32_syscalls_autoload.c,v 1.41 2024/05/20 01:40:45 christos Exp $ */
/*
* System call autoload table.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.145 2024/05/19 22:25:48 christos Exp
+ * created from NetBSD: syscalls.master,v 1.146 2024/05/20 01:30:33 christos Exp
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls_autoload.c,v 1.40 2024/05/19 22:27:15 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls_autoload.c,v 1.41 2024/05/20 01:40:45 christos Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -165,7 +165,7 @@ static struct sc_autoload netbsd32_sysca
#if defined(NTP) || !defined(_KERNEL_OPT)
#else
#endif
- { NETBSD32_SYS_compat_110_netbsd32_dup3, "compat_netbsd32_110" },
+ { NETBSD32_SYS_compat_100_netbsd32_dup3, "compat_netbsd32_100" },
{ NETBSD32_SYS_netbsd32___quotactl, "compat_netbsd32_quota" },
{ 0, NULL }
};
Index: src/sys/compat/netbsd32/netbsd32_systrace_args.c
diff -u src/sys/compat/netbsd32/netbsd32_systrace_args.c:1.53 src/sys/compat/netbsd32/netbsd32_systrace_args.c:1.54
--- src/sys/compat/netbsd32/netbsd32_systrace_args.c:1.53 Sun May 19 18:27:15 2024
+++ src/sys/compat/netbsd32/netbsd32_systrace_args.c Sun May 19 21:40:45 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_systrace_args.c,v 1.53 2024/05/19 22:27:15 christos Exp $ */
+/* $NetBSD: netbsd32_systrace_args.c,v 1.54 2024/05/20 01:40:45 christos Exp $ */
/*
* System call argument to DTrace register array conversion.
@@ -3269,7 +3269,7 @@ systrace_args(register_t sysnum, const v
}
/* netbsd32_dup3 */
case 454: {
- const struct compat_110_netbsd32_dup3_args *p = params;
+ const struct compat_100_netbsd32_dup3_args *p = params;
iarg[0] = SCARG(p, from); /* int */
iarg[1] = SCARG(p, to); /* int */
iarg[2] = SCARG(p, flags); /* int */
@@ -3752,9 +3752,9 @@ systrace_args(register_t sysnum, const v
*n_args = 5;
break;
}
- /* netbsd32___dup3110 */
+ /* netbsd32___dup3100 */
case 505: {
- const struct netbsd32___dup3110_args *p = params;
+ const struct netbsd32___dup3100_args *p = params;
iarg[0] = SCARG(p, from); /* int */
iarg[1] = SCARG(p, to); /* int */
iarg[2] = SCARG(p, flags); /* int */
@@ -10169,7 +10169,7 @@ systrace_entry_setargdesc(int sysnum, in
break;
};
break;
- /* netbsd32___dup3110 */
+ /* netbsd32___dup3100 */
case 505:
switch(ndx) {
case 0:
@@ -12302,7 +12302,7 @@ systrace_return_setargdesc(int sysnum, i
if (ndx == 0 || ndx == 1)
p = "int";
break;
- /* netbsd32___dup3110 */
+ /* netbsd32___dup3100 */
case 505:
if (ndx == 0 || ndx == 1)
p = "int";
Index: src/sys/kern/init_sysent.c
diff -u src/sys/kern/init_sysent.c:1.342 src/sys/kern/init_sysent.c:1.343
--- src/sys/kern/init_sysent.c:1.342 Sun May 19 18:27:15 2024
+++ src/sys/kern/init_sysent.c Sun May 19 21:40:44 2024
@@ -1,14 +1,14 @@
-/* $NetBSD: init_sysent.c,v 1.342 2024/05/19 22:27:15 christos Exp $ */
+/* $NetBSD: init_sysent.c,v 1.343 2024/05/20 01:40:44 christos Exp $ */
/*
* System call switch table.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.312 2024/05/19 22:25:48 christos Exp
+ * created from NetBSD: syscalls.master,v 1.313 2024/05/20 01:30:34 christos Exp
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: init_sysent.c,v 1.342 2024/05/19 22:27:15 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: init_sysent.c,v 1.343 2024/05/20 01:40:44 christos Exp $");
#ifdef _KERNEL_OPT
#include "opt_modular.h"
@@ -2223,9 +2223,9 @@ struct sysent sysent[] = {
.sy_call = (sy_call_t *)sys_pipe2
}, /* 453 = pipe2 */
{
- ns(struct compat_110_sys_dup3_args),
+ ns(struct compat_100_sys_dup3_args),
.sy_call = (sy_call_t *)sys_nomodule
- }, /* 454 = compat_110_dup3 */
+ }, /* 454 = compat_100_dup3 */
{
ns(struct sys_kqueue1_args),
.sy_call = (sy_call_t *)sys_kqueue1
@@ -2474,9 +2474,9 @@ struct sysent sysent[] = {
.sy_call = (sy_call_t *)sys_epoll_pwait2
}, /* 504 = epoll_pwait2 */
{
- ns(struct sys___dup3110_args),
- .sy_call = (sy_call_t *)sys___dup3110
- }, /* 505 = __dup3110 */
+ ns(struct sys___dup3100_args),
+ .sy_call = (sy_call_t *)sys___dup3100
+ }, /* 505 = __dup3100 */
{
.sy_call = sys_nosys,
}, /* 506 = filler */
Index: src/sys/kern/syscalls.c
diff -u src/sys/kern/syscalls.c:1.330 src/sys/kern/syscalls.c:1.331
--- src/sys/kern/syscalls.c:1.330 Sun May 19 18:27:15 2024
+++ src/sys/kern/syscalls.c Sun May 19 21:40:44 2024
@@ -1,14 +1,14 @@
-/* $NetBSD: syscalls.c,v 1.330 2024/05/19 22:27:15 christos Exp $ */
+/* $NetBSD: syscalls.c,v 1.331 2024/05/20 01:40:44 christos Exp $ */
/*
* System call names.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.312 2024/05/19 22:25:48 christos Exp
+ * created from NetBSD: syscalls.master,v 1.313 2024/05/20 01:30:34 christos Exp
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: syscalls.c,v 1.330 2024/05/19 22:27:15 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: syscalls.c,v 1.331 2024/05/20 01:40:44 christos Exp $");
#if defined(_KERNEL_OPT)
#ifdef _KERNEL_OPT
@@ -504,7 +504,7 @@ const char *const syscallnames[] = {
/* 451 */ "__fhstat50",
/* 452 */ "#452 (obsolete 5.99 quotactl)",
/* 453 */ "pipe2",
- /* 454 */ "compat_110_dup3",
+ /* 454 */ "compat_100_dup3",
/* 455 */ "kqueue1",
/* 456 */ "paccept",
/* 457 */ "linkat",
@@ -555,7 +555,7 @@ const char *const syscallnames[] = {
/* 502 */ "epoll_create1",
/* 503 */ "epoll_ctl",
/* 504 */ "epoll_pwait2",
- /* 505 */ "__dup3110",
+ /* 505 */ "__dup3100",
/* 506 */ "# filler",
/* 507 */ "# filler",
/* 508 */ "# filler",
@@ -1041,7 +1041,7 @@ const char *const altsyscallnames[] = {
/* 451 */ "fhstat",
/* 452 */ NULL, /* obsolete 5.99 quotactl */
/* 453 */ NULL, /* pipe2 */
- /* 454 */ NULL, /* compat_110_dup3 */
+ /* 454 */ NULL, /* compat_100_dup3 */
/* 455 */ NULL, /* kqueue1 */
/* 456 */ NULL, /* paccept */
/* 457 */ NULL, /* linkat */
Index: src/sys/kern/syscalls_autoload.c
diff -u src/sys/kern/syscalls_autoload.c:1.46 src/sys/kern/syscalls_autoload.c:1.47
--- src/sys/kern/syscalls_autoload.c:1.46 Sun May 19 18:27:15 2024
+++ src/sys/kern/syscalls_autoload.c Sun May 19 21:40:44 2024
@@ -1,14 +1,14 @@
-/* $NetBSD: syscalls_autoload.c,v 1.46 2024/05/19 22:27:15 christos Exp $ */
+/* $NetBSD: syscalls_autoload.c,v 1.47 2024/05/20 01:40:44 christos Exp $ */
/*
* System call autoload table.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.312 2024/05/19 22:25:48 christos Exp
+ * created from NetBSD: syscalls.master,v 1.313 2024/05/20 01:30:34 christos Exp
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: syscalls_autoload.c,v 1.46 2024/05/19 22:27:15 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: syscalls_autoload.c,v 1.47 2024/05/20 01:40:44 christos Exp $");
#ifdef _KERNEL_OPT
#include "opt_modular.h"
@@ -208,6 +208,6 @@ static struct sc_autoload netbsd_syscall
#if defined(NTP) || !defined(_KERNEL_OPT)
#else
#endif
- { SYS_compat_110_dup3, "compat_110" },
+ { SYS_compat_100_dup3, "compat_100" },
{ 0, NULL }
};
Index: src/sys/kern/systrace_args.c
diff -u src/sys/kern/systrace_args.c:1.52 src/sys/kern/systrace_args.c:1.53
--- src/sys/kern/systrace_args.c:1.52 Sun May 19 18:27:15 2024
+++ src/sys/kern/systrace_args.c Sun May 19 21:40:44 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: systrace_args.c,v 1.52 2024/05/19 22:27:15 christos Exp $ */
+/* $NetBSD: systrace_args.c,v 1.53 2024/05/20 01:40:44 christos Exp $ */
/*
* System call argument to DTrace register array conversion.
@@ -3452,7 +3452,7 @@ systrace_args(register_t sysnum, const v
}
/* sys_dup3 */
case 454: {
- const struct compat_110_sys_dup3_args *p = params;
+ const struct compat_100_sys_dup3_args *p = params;
iarg[0] = SCARG(p, from); /* int */
iarg[1] = SCARG(p, to); /* int */
iarg[2] = SCARG(p, flags); /* int */
@@ -3935,9 +3935,9 @@ systrace_args(register_t sysnum, const v
*n_args = 5;
break;
}
- /* sys___dup3110 */
+ /* sys___dup3100 */
case 505: {
- const struct sys___dup3110_args *p = params;
+ const struct sys___dup3100_args *p = params;
iarg[0] = SCARG(p, from); /* int */
iarg[1] = SCARG(p, to); /* int */
iarg[2] = SCARG(p, flags); /* int */
@@ -10638,7 +10638,7 @@ systrace_entry_setargdesc(int sysnum, in
break;
};
break;
- /* sys___dup3110 */
+ /* sys___dup3100 */
case 505:
switch(ndx) {
case 0:
@@ -12881,7 +12881,7 @@ systrace_return_setargdesc(int sysnum, i
if (ndx == 0 || ndx == 1)
p = "int";
break;
- /* sys___dup3110 */
+ /* sys___dup3100 */
case 505:
if (ndx == 0 || ndx == 1)
p = "int";
Index: src/sys/rump/rump.sysmap
diff -u src/sys/rump/rump.sysmap:1.10 src/sys/rump/rump.sysmap:1.11
--- src/sys/rump/rump.sysmap:1.10 Fri Jul 28 14:19:01 2023
+++ src/sys/rump/rump.sysmap Sun May 19 21:40:44 2024
@@ -190,7 +190,7 @@
450 sys___mknod50 __mknod50 rump___sysimpl_mknod50
451 sys___fhstat50 __fhstat50 rump___sysimpl_fhstat50
453 sys_pipe2 pipe2 rump___sysimpl_pipe2
-454 sys_dup3 dup3 rump___sysimpl_dup3
+454 sys_nomodule dup3 rump___sysimpl_dup3
455 sys_kqueue1 kqueue1 rump___sysimpl_kqueue1
456 sys_paccept paccept rump___sysimpl_paccept
457 sys_linkat linkat rump___sysimpl_linkat
@@ -221,3 +221,4 @@
486 sys___fhstatvfs190 __fhstatvfs190 rump___sysimpl_fhstatvfs190
499 sys_lpathconf lpathconf rump___sysimpl_lpathconf
501 sys___kevent100 __kevent100 rump___sysimpl_kevent100
+505 sys___dup3100 __dup3100 rump___sysimpl_dup3100
Index: src/sys/rump/include/rump/rump_syscalls.h
diff -u src/sys/rump/include/rump/rump_syscalls.h:1.129 src/sys/rump/include/rump/rump_syscalls.h:1.130
--- src/sys/rump/include/rump/rump_syscalls.h:1.129 Sun May 19 18:27:16 2024
+++ src/sys/rump/include/rump/rump_syscalls.h Sun May 19 21:40:44 2024
@@ -1,10 +1,10 @@
-/* $NetBSD: rump_syscalls.h,v 1.129 2024/05/19 22:27:16 christos Exp $ */
+/* $NetBSD: rump_syscalls.h,v 1.130 2024/05/20 01:40:44 christos Exp $ */
/*
* System call protos in rump namespace.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.312 2024/05/19 22:25:48 christos Exp
+ * created from NetBSD: syscalls.master,v 1.313 2024/05/20 01:30:34 christos Exp
*/
#ifndef _RUMP_RUMP_SYSCALLS_H_
@@ -193,7 +193,7 @@
#endif
#ifndef RUMP_SYS_RENAME_DUP3
-#define RUMP_SYS_RENAME_DUP3 rump___sysimpl_dup3110
+#define RUMP_SYS_RENAME_DUP3 rump___sysimpl_dup3100
#endif
#ifndef RUMP_SYS_RENAME_EXTATTR_DELETE_FD
Index: src/sys/rump/librump/rumpkern/rump_syscalls.c
diff -u src/sys/rump/librump/rumpkern/rump_syscalls.c:1.160 src/sys/rump/librump/rumpkern/rump_syscalls.c:1.161
--- src/sys/rump/librump/rumpkern/rump_syscalls.c:1.160 Sun May 19 18:27:16 2024
+++ src/sys/rump/librump/rumpkern/rump_syscalls.c Sun May 19 21:40:44 2024
@@ -1,10 +1,10 @@
-/* $NetBSD: rump_syscalls.c,v 1.160 2024/05/19 22:27:16 christos Exp $ */
+/* $NetBSD: rump_syscalls.c,v 1.161 2024/05/20 01:40:44 christos Exp $ */
/*
* System call vector and marshalling for rump.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.312 2024/05/19 22:25:48 christos Exp
+ * created from NetBSD: syscalls.master,v 1.313 2024/05/20 01:30:34 christos Exp
*/
#ifdef RUMP_CLIENT
@@ -15,7 +15,7 @@
#ifdef __NetBSD__
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rump_syscalls.c,v 1.160 2024/05/19 22:27:16 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rump_syscalls.c,v 1.161 2024/05/20 01:40:44 christos Exp $");
#include <sys/fstypes.h>
#include <sys/proc.h>
@@ -5709,14 +5709,14 @@ rump___sysimpl_dup3(int from, int to, in
register_t retval[2];
int error = 0;
int rv = -1;
- struct compat_110_sys_dup3_args callarg;
+ struct compat_100_sys_dup3_args callarg;
memset(&callarg, 0, sizeof(callarg));
SPARG(&callarg, from) = from;
SPARG(&callarg, to) = to;
SPARG(&callarg, flags) = flags;
- error = rsys_syscall(SYS_compat_110_dup3, &callarg, sizeof(callarg), retval);
+ error = rsys_syscall(SYS_compat_100_dup3, &callarg, sizeof(callarg), retval);
rsys_seterrno(error);
if (error == 0) {
if (sizeof(int) > sizeof(register_t))
@@ -6650,21 +6650,21 @@ __weak_alias(___kevent100,rump___sysimpl
__strong_alias(_sys___kevent100,rump___sysimpl_kevent100);
#endif /* RUMP_KERNEL_IS_LIBC */
-int rump___sysimpl_dup3110(int, int, int);
+int rump___sysimpl_dup3100(int, int, int);
int
-rump___sysimpl_dup3110(int from, int to, int flags)
+rump___sysimpl_dup3100(int from, int to, int flags)
{
register_t retval[2];
int error = 0;
int rv = -1;
- struct sys___dup3110_args callarg;
+ struct sys___dup3100_args callarg;
memset(&callarg, 0, sizeof(callarg));
SPARG(&callarg, from) = from;
SPARG(&callarg, to) = to;
SPARG(&callarg, flags) = flags;
- error = rsys_syscall(SYS___dup3110, &callarg, sizeof(callarg), retval);
+ error = rsys_syscall(SYS___dup3100, &callarg, sizeof(callarg), retval);
rsys_seterrno(error);
if (error == 0) {
if (sizeof(int) > sizeof(register_t))
@@ -6675,10 +6675,10 @@ rump___sysimpl_dup3110(int from, int to,
return rv;
}
#ifdef RUMP_KERNEL_IS_LIBC
-__weak_alias(dup3,rump___sysimpl_dup3110);
-__weak_alias(__dup3110,rump___sysimpl_dup3110);
-__weak_alias(___dup3110,rump___sysimpl_dup3110);
-__strong_alias(_sys___dup3110,rump___sysimpl_dup3110);
+__weak_alias(dup3,rump___sysimpl_dup3100);
+__weak_alias(__dup3100,rump___sysimpl_dup3100);
+__weak_alias(___dup3100,rump___sysimpl_dup3100);
+__strong_alias(_sys___dup3100,rump___sysimpl_dup3100);
#endif /* RUMP_KERNEL_IS_LIBC */
int rump_sys_pipe(int *);
@@ -8472,9 +8472,9 @@ struct sysent rump_sysent[] = {
.sy_call = (sy_call_t *)(void *)rumpns_enosys,
}, /* 453 = pipe2 */
{
- ns(struct compat_110_sys_dup3_args),
+ ns(struct compat_100_sys_dup3_args),
.sy_call = (sy_call_t *)(void *)rumpns_sys_nomodule,
- }, /* 454 = compat_110_dup3 */
+ }, /* 454 = compat_100_dup3 */
{
ns(struct sys_kqueue1_args),
.sy_call = (sy_call_t *)(void *)rumpns_enosys,
@@ -8656,9 +8656,9 @@ struct sysent rump_sysent[] = {
.sy_call = (sy_call_t *)(void *)rumpns_enosys,
}, /* 504 = epoll_pwait2 */
{
- ns(struct sys___dup3110_args),
+ ns(struct sys___dup3100_args),
.sy_call = (sy_call_t *)(void *)rumpns_enosys,
- }, /* 505 = __dup3110 */
+ }, /* 505 = __dup3100 */
{
.sy_flags = SYCALL_NOSYS,
.sy_call = (sy_call_t *)(void *)rumpns_enosys,
Index: src/sys/rump/librump/rumpkern/rumpkern_syscalls.c
diff -u src/sys/rump/librump/rumpkern/rumpkern_syscalls.c:1.10 src/sys/rump/librump/rumpkern/rumpkern_syscalls.c:1.11
--- src/sys/rump/librump/rumpkern/rumpkern_syscalls.c:1.10 Sun May 19 18:27:16 2024
+++ src/sys/rump/librump/rumpkern/rumpkern_syscalls.c Sun May 19 21:40:44 2024
@@ -1,9 +1,9 @@
-/* $NetBSD: rumpkern_syscalls.c,v 1.10 2024/05/19 22:27:16 christos Exp $ */
+/* $NetBSD: rumpkern_syscalls.c,v 1.11 2024/05/20 01:40:44 christos Exp $ */
/* AUTOMATICALLY GENERATED BY makerumpsyscalls.sh */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rumpkern_syscalls.c,v 1.10 2024/05/19 22:27:16 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rumpkern_syscalls.c,v 1.11 2024/05/20 01:40:44 christos Exp $");
#include <sys/param.h>
@@ -73,7 +73,6 @@ extern sy_call_t sys___fstat50;
extern sy_call_t sys___timer_settime50;
extern sy_call_t sys___timer_gettime50;
extern sy_call_t sys_pipe2;
-extern sy_call_t sys_dup3;
extern sy_call_t sys_kqueue1;
extern sy_call_t sys_clock_nanosleep;
extern sy_call_t sys_clock_getcpuclockid2;
@@ -144,7 +143,6 @@ static const struct rump_onesyscall mysy
{ 446, sys___timer_settime50 },
{ 447, sys___timer_gettime50 },
{ 453, sys_pipe2 },
- { 454, sys_dup3 },
{ 455, sys_kqueue1 },
{ 477, sys_clock_nanosleep },
{ 482, sys_clock_getcpuclockid2 },
Index: src/sys/rump/librump/rumpnet/rumpnet_syscalls.c
diff -u src/sys/rump/librump/rumpnet/rumpnet_syscalls.c:1.9 src/sys/rump/librump/rumpnet/rumpnet_syscalls.c:1.10
--- src/sys/rump/librump/rumpnet/rumpnet_syscalls.c:1.9 Sun May 19 18:27:16 2024
+++ src/sys/rump/librump/rumpnet/rumpnet_syscalls.c Sun May 19 21:40:44 2024
@@ -1,9 +1,9 @@
-/* $NetBSD: rumpnet_syscalls.c,v 1.9 2024/05/19 22:27:16 christos Exp $ */
+/* $NetBSD: rumpnet_syscalls.c,v 1.10 2024/05/20 01:40:44 christos Exp $ */
/* AUTOMATICALLY GENERATED BY makerumpsyscalls.sh */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rumpnet_syscalls.c,v 1.9 2024/05/19 22:27:16 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rumpnet_syscalls.c,v 1.10 2024/05/20 01:40:44 christos Exp $");
#include <sys/param.h>
Index: src/sys/rump/librump/rumpvfs/rumpvfs_syscalls.c
diff -u src/sys/rump/librump/rumpvfs/rumpvfs_syscalls.c:1.11 src/sys/rump/librump/rumpvfs/rumpvfs_syscalls.c:1.12
--- src/sys/rump/librump/rumpvfs/rumpvfs_syscalls.c:1.11 Sun May 19 18:27:16 2024
+++ src/sys/rump/librump/rumpvfs/rumpvfs_syscalls.c Sun May 19 21:40:45 2024
@@ -1,9 +1,9 @@
-/* $NetBSD: rumpvfs_syscalls.c,v 1.11 2024/05/19 22:27:16 christos Exp $ */
+/* $NetBSD: rumpvfs_syscalls.c,v 1.12 2024/05/20 01:40:45 christos Exp $ */
/* AUTOMATICALLY GENERATED BY makerumpsyscalls.sh */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rumpvfs_syscalls.c,v 1.11 2024/05/19 22:27:16 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rumpvfs_syscalls.c,v 1.12 2024/05/20 01:40:45 christos Exp $");
#include <sys/param.h>
Index: src/sys/sys/syscall.h
diff -u src/sys/sys/syscall.h:1.325 src/sys/sys/syscall.h:1.326
--- src/sys/sys/syscall.h:1.325 Sun May 19 18:27:15 2024
+++ src/sys/sys/syscall.h Sun May 19 21:40:44 2024
@@ -1,10 +1,10 @@
-/* $NetBSD: syscall.h,v 1.325 2024/05/19 22:27:15 christos Exp $ */
+/* $NetBSD: syscall.h,v 1.326 2024/05/20 01:40:44 christos Exp $ */
/*
* System call numbers.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.312 2024/05/19 22:25:48 christos Exp
+ * created from NetBSD: syscalls.master,v 1.313 2024/05/20 01:30:34 christos Exp
*/
#ifndef _SYS_SYSCALL_H_
@@ -1266,8 +1266,8 @@
/* syscall: "pipe2" ret: "int" args: "int *" "int" */
#define SYS_pipe2 453
-/* syscall: "compat_110_dup3" ret: "int" args: "int" "int" "int" */
-#define SYS_compat_110_dup3 454
+/* syscall: "compat_100_dup3" ret: "int" args: "int" "int" "int" */
+#define SYS_compat_100_dup3 454
/* syscall: "kqueue1" ret: "int" args: "int" */
#define SYS_kqueue1 455
@@ -1419,8 +1419,8 @@
/* syscall: "epoll_pwait2" ret: "int" args: "int" "struct epoll_event *" "int" "const struct timespec *" "const sigset_t *" */
#define SYS_epoll_pwait2 504
-/* syscall: "__dup3110" ret: "int" args: "int" "int" "int" */
-#define SYS___dup3110 505
+/* syscall: "__dup3100" ret: "int" args: "int" "int" "int" */
+#define SYS___dup3100 505
#define SYS_MAXSYSCALL 506
#define SYS_NSYSENT 512
Index: src/sys/sys/syscallargs.h
diff -u src/sys/sys/syscallargs.h:1.308 src/sys/sys/syscallargs.h:1.309
--- src/sys/sys/syscallargs.h:1.308 Sun May 19 18:27:15 2024
+++ src/sys/sys/syscallargs.h Sun May 19 21:40:44 2024
@@ -1,10 +1,10 @@
-/* $NetBSD: syscallargs.h,v 1.308 2024/05/19 22:27:15 christos Exp $ */
+/* $NetBSD: syscallargs.h,v 1.309 2024/05/20 01:40:44 christos Exp $ */
/*
* System call argument lists.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.312 2024/05/19 22:25:48 christos Exp
+ * created from NetBSD: syscalls.master,v 1.313 2024/05/20 01:30:34 christos Exp
*/
#ifndef _SYS_SYSCALLARGS_H_
@@ -2979,12 +2979,12 @@ struct sys_pipe2_args {
};
check_syscall_args(sys_pipe2)
-struct compat_110_sys_dup3_args {
+struct compat_100_sys_dup3_args {
syscallarg(int) from;
syscallarg(int) to;
syscallarg(int) flags;
};
-check_syscall_args(compat_110_sys_dup3)
+check_syscall_args(compat_100_sys_dup3)
struct sys_kqueue1_args {
syscallarg(int) flags;
@@ -3402,12 +3402,12 @@ struct sys_epoll_pwait2_args {
check_syscall_args(sys_epoll_pwait2)
#endif /* !RUMP_CLIENT */
-struct sys___dup3110_args {
+struct sys___dup3100_args {
syscallarg(int) from;
syscallarg(int) to;
syscallarg(int) flags;
};
-check_syscall_args(sys___dup3110)
+check_syscall_args(sys___dup3100)
/*
* System call prototypes.
@@ -4241,7 +4241,7 @@ int sys___fhstat50(struct lwp *, const s
int sys_pipe2(struct lwp *, const struct sys_pipe2_args *, register_t *);
-int compat_110_sys_dup3(struct lwp *, const struct compat_110_sys_dup3_args *, register_t *);
+int compat_100_sys_dup3(struct lwp *, const struct compat_100_sys_dup3_args *, register_t *);
int sys_kqueue1(struct lwp *, const struct sys_kqueue1_args *, register_t *);
@@ -4343,7 +4343,7 @@ int sys_epoll_ctl(struct lwp *, const st
int sys_epoll_pwait2(struct lwp *, const struct sys_epoll_pwait2_args *, register_t *);
-int sys___dup3110(struct lwp *, const struct sys___dup3110_args *, register_t *);
+int sys___dup3100(struct lwp *, const struct sys___dup3100_args *, register_t *);
#endif /* !RUMP_CLIENT */
#endif /* _SYS_SYSCALLARGS_H_ */
