Module Name: src
Committed By: christos
Date: Thu Feb 2 15:36:12 UTC 2017
Modified Files:
src/sys/compat/linux/arch/amd64: linux_syscall.h linux_syscallargs.h
linux_syscalls.c linux_sysent.c linux_systrace_args.c
src/sys/compat/linux/arch/mips: linux_syscall.h linux_syscallargs.h
linux_syscalls.c linux_sysent.c
Log Message:
regen
To generate a diff of this commit:
cvs rdiff -u -r1.64 -r1.65 src/sys/compat/linux/arch/amd64/linux_syscall.h \
src/sys/compat/linux/arch/amd64/linux_syscallargs.h \
src/sys/compat/linux/arch/amd64/linux_syscalls.c \
src/sys/compat/linux/arch/amd64/linux_sysent.c
cvs rdiff -u -r1.8 -r1.9 \
src/sys/compat/linux/arch/amd64/linux_systrace_args.c
cvs rdiff -u -r1.71 -r1.72 src/sys/compat/linux/arch/mips/linux_syscall.h
cvs rdiff -u -r1.70 -r1.71 src/sys/compat/linux/arch/mips/linux_syscallargs.h \
src/sys/compat/linux/arch/mips/linux_syscalls.c \
src/sys/compat/linux/arch/mips/linux_sysent.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/compat/linux/arch/amd64/linux_syscall.h
diff -u src/sys/compat/linux/arch/amd64/linux_syscall.h:1.64 src/sys/compat/linux/arch/amd64/linux_syscall.h:1.65
--- src/sys/compat/linux/arch/amd64/linux_syscall.h:1.64 Sun Jan 15 19:11:09 2017
+++ src/sys/compat/linux/arch/amd64/linux_syscall.h Thu Feb 2 10:36:12 2017
@@ -1,10 +1,10 @@
-/* $NetBSD: linux_syscall.h,v 1.64 2017/01/16 00:11:09 christos Exp $ */
+/* $NetBSD: linux_syscall.h,v 1.65 2017/02/02 15:36:12 christos Exp $ */
/*
* System call numbers.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.58 2017/01/02 16:32:09 manu Exp
+ * created from NetBSD: syscalls.master,v 1.59 2017/02/02 15:35:46 christos Exp
*/
#ifndef _LINUX_SYS_SYSCALL_H_
@@ -645,6 +645,9 @@
/* syscall: "utimensat" ret: "int" args: "int" "const char *" "struct linux_timespec *" "int" */
#define LINUX_SYS_utimensat 280
+/* syscall: "accept4" ret: "int" args: "int" "struct osockaddr *" "int *" "int" */
+#define LINUX_SYS_accept4 288
+
/* syscall: "dup3" ret: "int" args: "int" "int" "int" */
#define LINUX_SYS_dup3 292
Index: src/sys/compat/linux/arch/amd64/linux_syscallargs.h
diff -u src/sys/compat/linux/arch/amd64/linux_syscallargs.h:1.64 src/sys/compat/linux/arch/amd64/linux_syscallargs.h:1.65
--- src/sys/compat/linux/arch/amd64/linux_syscallargs.h:1.64 Sun Jan 15 19:11:09 2017
+++ src/sys/compat/linux/arch/amd64/linux_syscallargs.h Thu Feb 2 10:36:12 2017
@@ -1,10 +1,10 @@
-/* $NetBSD: linux_syscallargs.h,v 1.64 2017/01/16 00:11:09 christos Exp $ */
+/* $NetBSD: linux_syscallargs.h,v 1.65 2017/02/02 15:36:12 christos Exp $ */
/*
* System call argument lists.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.58 2017/01/02 16:32:09 manu Exp
+ * created from NetBSD: syscalls.master,v 1.59 2017/02/02 15:35:46 christos Exp
*/
#ifndef _LINUX_SYS_SYSCALLARGS_H_
@@ -1004,6 +1004,14 @@ struct linux_sys_utimensat_args {
};
check_syscall_args(linux_sys_utimensat)
+struct linux_sys_accept4_args {
+ syscallarg(int) s;
+ syscallarg(struct osockaddr *) name;
+ syscallarg(int *) anamelen;
+ syscallarg(int) flags;
+};
+check_syscall_args(linux_sys_accept4)
+
struct linux_sys_dup3_args {
syscallarg(int) from;
syscallarg(int) to;
@@ -1448,6 +1456,8 @@ int linux_sys_get_robust_list(struct lwp
int linux_sys_utimensat(struct lwp *, const struct linux_sys_utimensat_args *, register_t *);
+int linux_sys_accept4(struct lwp *, const struct linux_sys_accept4_args *, register_t *);
+
int linux_sys_dup3(struct lwp *, const struct linux_sys_dup3_args *, register_t *);
int linux_sys_pipe2(struct lwp *, const struct linux_sys_pipe2_args *, register_t *);
Index: src/sys/compat/linux/arch/amd64/linux_syscalls.c
diff -u src/sys/compat/linux/arch/amd64/linux_syscalls.c:1.64 src/sys/compat/linux/arch/amd64/linux_syscalls.c:1.65
--- src/sys/compat/linux/arch/amd64/linux_syscalls.c:1.64 Sun Jan 15 19:11:09 2017
+++ src/sys/compat/linux/arch/amd64/linux_syscalls.c Thu Feb 2 10:36:12 2017
@@ -1,14 +1,14 @@
-/* $NetBSD: linux_syscalls.c,v 1.64 2017/01/16 00:11:09 christos Exp $ */
+/* $NetBSD: linux_syscalls.c,v 1.65 2017/02/02 15:36:12 christos Exp $ */
/*
* System call names.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.58 2017/01/02 16:32:09 manu Exp
+ * created from NetBSD: syscalls.master,v 1.59 2017/02/02 15:35:46 christos Exp
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_syscalls.c,v 1.64 2017/01/16 00:11:09 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_syscalls.c,v 1.65 2017/02/02 15:36:12 christos Exp $");
#if defined(_KERNEL_OPT)
#if defined(_KERNEL_OPT)
@@ -354,7 +354,7 @@ const char *const linux_syscallnames[] =
/* 285 */ "#285 (unimplemented fallocate)",
/* 286 */ "#286 (unimplemented timerfd_settime)",
/* 287 */ "#287 (unimplemented timerfd_gettime)",
- /* 288 */ "#288 (unimplemented accept4)",
+ /* 288 */ "accept4",
/* 289 */ "#289 (unimplemented signalfd4)",
/* 290 */ "#290 (unimplemented eventfd2)",
/* 291 */ "#291 (unimplemented epoll_create1)",
@@ -898,7 +898,7 @@ const char *const altlinux_syscallnames[
/* 285 */ NULL, /* unimplemented fallocate */
/* 286 */ NULL, /* unimplemented timerfd_settime */
/* 287 */ NULL, /* unimplemented timerfd_gettime */
- /* 288 */ NULL, /* unimplemented accept4 */
+ /* 288 */ NULL, /* accept4 */
/* 289 */ NULL, /* unimplemented signalfd4 */
/* 290 */ NULL, /* unimplemented eventfd2 */
/* 291 */ NULL, /* unimplemented epoll_create1 */
Index: src/sys/compat/linux/arch/amd64/linux_sysent.c
diff -u src/sys/compat/linux/arch/amd64/linux_sysent.c:1.64 src/sys/compat/linux/arch/amd64/linux_sysent.c:1.65
--- src/sys/compat/linux/arch/amd64/linux_sysent.c:1.64 Sun Jan 15 19:11:09 2017
+++ src/sys/compat/linux/arch/amd64/linux_sysent.c Thu Feb 2 10:36:12 2017
@@ -1,14 +1,14 @@
-/* $NetBSD: linux_sysent.c,v 1.64 2017/01/16 00:11:09 christos Exp $ */
+/* $NetBSD: linux_sysent.c,v 1.65 2017/02/02 15:36:12 christos Exp $ */
/*
* System call switch table.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.58 2017/01/02 16:32:09 manu Exp
+ * created from NetBSD: syscalls.master,v 1.59 2017/02/02 15:35:46 christos Exp
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_sysent.c,v 1.64 2017/01/16 00:11:09 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_sysent.c,v 1.65 2017/02/02 15:36:12 christos Exp $");
#if defined(_KERNEL_OPT)
#include "opt_sysv.h"
@@ -1288,8 +1288,10 @@ struct sysent linux_sysent[] = {
.sy_call = linux_sys_nosys,
}, /* 287 = filler */
{
- .sy_call = linux_sys_nosys,
- }, /* 288 = filler */
+ ns(struct linux_sys_accept4_args),
+ .sy_flags = SYCALL_ARG_PTR,
+ .sy_call = (sy_call_t *)linux_sys_accept4
+ }, /* 288 = accept4 */
{
.sy_call = linux_sys_nosys,
}, /* 289 = filler */
Index: src/sys/compat/linux/arch/amd64/linux_systrace_args.c
diff -u src/sys/compat/linux/arch/amd64/linux_systrace_args.c:1.8 src/sys/compat/linux/arch/amd64/linux_systrace_args.c:1.9
--- src/sys/compat/linux/arch/amd64/linux_systrace_args.c:1.8 Sun Jan 15 19:11:09 2017
+++ src/sys/compat/linux/arch/amd64/linux_systrace_args.c Thu Feb 2 10:36:12 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_systrace_args.c,v 1.8 2017/01/16 00:11:09 christos Exp $ */
+/* $NetBSD: linux_systrace_args.c,v 1.9 2017/02/02 15:36:12 christos Exp $ */
/*
* System call argument to DTrace register array converstion.
@@ -1743,6 +1743,16 @@ systrace_args(register_t sysnum, const v
*n_args = 4;
break;
}
+ /* linux_sys_accept4 */
+ case 288: {
+ const struct linux_sys_accept4_args *p = params;
+ iarg[0] = SCARG(p, s); /* int */
+ uarg[1] = (intptr_t) SCARG(p, name); /* struct osockaddr * */
+ uarg[2] = (intptr_t) SCARG(p, anamelen); /* int * */
+ iarg[3] = SCARG(p, flags); /* int */
+ *n_args = 4;
+ break;
+ }
/* linux_sys_dup3 */
case 292: {
const struct linux_sys_dup3_args *p = params;
@@ -4656,6 +4666,25 @@ systrace_entry_setargdesc(int sysnum, in
break;
};
break;
+ /* linux_sys_accept4 */
+ case 288:
+ switch(ndx) {
+ case 0:
+ p = "int";
+ break;
+ case 1:
+ p = "struct osockaddr *";
+ break;
+ case 2:
+ p = "int *";
+ break;
+ case 3:
+ p = "int";
+ break;
+ default:
+ break;
+ };
+ break;
/* linux_sys_dup3 */
case 292:
switch(ndx) {
@@ -5696,6 +5725,11 @@ systrace_return_setargdesc(int sysnum, i
if (ndx == 0 || ndx == 1)
p = "int";
break;
+ /* linux_sys_accept4 */
+ case 288:
+ if (ndx == 0 || ndx == 1)
+ p = "int";
+ break;
/* linux_sys_dup3 */
case 292:
if (ndx == 0 || ndx == 1)
Index: src/sys/compat/linux/arch/mips/linux_syscall.h
diff -u src/sys/compat/linux/arch/mips/linux_syscall.h:1.71 src/sys/compat/linux/arch/mips/linux_syscall.h:1.72
--- src/sys/compat/linux/arch/mips/linux_syscall.h:1.71 Sun Jan 15 19:11:09 2017
+++ src/sys/compat/linux/arch/mips/linux_syscall.h Thu Feb 2 10:36:12 2017
@@ -1,10 +1,10 @@
-/* $NetBSD: linux_syscall.h,v 1.71 2017/01/16 00:11:09 christos Exp $ */
+/* $NetBSD: linux_syscall.h,v 1.72 2017/02/02 15:36:12 christos Exp $ */
/*
* System call numbers.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.61 2017/01/02 16:32:10 manu Exp
+ * created from NetBSD: syscalls.master,v 1.62 2017/02/02 15:35:46 christos Exp
*/
#ifndef _LINUX_SYS_SYSCALL_H_
@@ -688,6 +688,9 @@
/* syscall: "pipe2" ret: "int" args: "int *" "int" */
#define LINUX_SYS_pipe2 328
+/* syscall: "accept4" ret: "int" args: "int" "struct osockaddr *" "int *" "int" */
+#define LINUX_SYS_accept4 334
+
#define LINUX_SYS_MAXSYSCALL 336
#define LINUX_SYS_NSYSENT 512
#endif /* _LINUX_SYS_SYSCALL_H_ */
Index: src/sys/compat/linux/arch/mips/linux_syscallargs.h
diff -u src/sys/compat/linux/arch/mips/linux_syscallargs.h:1.70 src/sys/compat/linux/arch/mips/linux_syscallargs.h:1.71
--- src/sys/compat/linux/arch/mips/linux_syscallargs.h:1.70 Sun Jan 15 19:11:09 2017
+++ src/sys/compat/linux/arch/mips/linux_syscallargs.h Thu Feb 2 10:36:12 2017
@@ -1,10 +1,10 @@
-/* $NetBSD: linux_syscallargs.h,v 1.70 2017/01/16 00:11:09 christos Exp $ */
+/* $NetBSD: linux_syscallargs.h,v 1.71 2017/02/02 15:36:12 christos Exp $ */
/*
* System call argument lists.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.61 2017/01/02 16:32:10 manu Exp
+ * created from NetBSD: syscalls.master,v 1.62 2017/02/02 15:35:46 christos Exp
*/
#ifndef _LINUX_SYS_SYSCALLARGS_H_
@@ -1049,6 +1049,14 @@ struct linux_sys_pipe2_args {
};
check_syscall_args(linux_sys_pipe2)
+struct linux_sys_accept4_args {
+ syscallarg(int) s;
+ syscallarg(struct osockaddr *) name;
+ syscallarg(int *) anamelen;
+ syscallarg(int) flags;
+};
+check_syscall_args(linux_sys_accept4)
+
/*
* System call prototypes.
*/
@@ -1501,4 +1509,6 @@ int linux_sys_dup3(struct lwp *, const s
int linux_sys_pipe2(struct lwp *, const struct linux_sys_pipe2_args *, register_t *);
+int linux_sys_accept4(struct lwp *, const struct linux_sys_accept4_args *, register_t *);
+
#endif /* _LINUX_SYS_SYSCALLARGS_H_ */
Index: src/sys/compat/linux/arch/mips/linux_syscalls.c
diff -u src/sys/compat/linux/arch/mips/linux_syscalls.c:1.70 src/sys/compat/linux/arch/mips/linux_syscalls.c:1.71
--- src/sys/compat/linux/arch/mips/linux_syscalls.c:1.70 Sun Jan 15 19:11:09 2017
+++ src/sys/compat/linux/arch/mips/linux_syscalls.c Thu Feb 2 10:36:12 2017
@@ -1,14 +1,14 @@
-/* $NetBSD: linux_syscalls.c,v 1.70 2017/01/16 00:11:09 christos Exp $ */
+/* $NetBSD: linux_syscalls.c,v 1.71 2017/02/02 15:36:12 christos Exp $ */
/*
* System call names.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.61 2017/01/02 16:32:10 manu Exp
+ * created from NetBSD: syscalls.master,v 1.62 2017/02/02 15:35:46 christos Exp
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_syscalls.c,v 1.70 2017/01/16 00:11:09 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_syscalls.c,v 1.71 2017/02/02 15:36:12 christos Exp $");
#if defined(_KERNEL_OPT)
#include <sys/param.h>
@@ -364,7 +364,7 @@ const char *const linux_syscallnames[] =
/* 331 */ "#331 (unimplemented pwritev)",
/* 332 */ "#332 (unimplemented rt_tgsigqueueinfo)",
/* 333 */ "#333 (unimplemented perf_event_open)",
- /* 334 */ "#334 (unimplemented accept4)",
+ /* 334 */ "accept4",
/* 335 */ "#335 (unimplemented recvmmsg)",
/* 336 */ "# filler",
/* 337 */ "# filler",
@@ -881,7 +881,7 @@ const char *const altlinux_syscallnames[
/* 331 */ NULL, /* unimplemented pwritev */
/* 332 */ NULL, /* unimplemented rt_tgsigqueueinfo */
/* 333 */ NULL, /* unimplemented perf_event_open */
- /* 334 */ NULL, /* unimplemented accept4 */
+ /* 334 */ NULL, /* accept4 */
/* 335 */ NULL, /* unimplemented recvmmsg */
/* 336 */ NULL, /* filler */
/* 337 */ NULL, /* filler */
Index: src/sys/compat/linux/arch/mips/linux_sysent.c
diff -u src/sys/compat/linux/arch/mips/linux_sysent.c:1.70 src/sys/compat/linux/arch/mips/linux_sysent.c:1.71
--- src/sys/compat/linux/arch/mips/linux_sysent.c:1.70 Sun Jan 15 19:11:09 2017
+++ src/sys/compat/linux/arch/mips/linux_sysent.c Thu Feb 2 10:36:12 2017
@@ -1,14 +1,14 @@
-/* $NetBSD: linux_sysent.c,v 1.70 2017/01/16 00:11:09 christos Exp $ */
+/* $NetBSD: linux_sysent.c,v 1.71 2017/02/02 15:36:12 christos Exp $ */
/*
* System call switch table.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.61 2017/01/02 16:32:10 manu Exp
+ * created from NetBSD: syscalls.master,v 1.62 2017/02/02 15:35:46 christos Exp
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_sysent.c,v 1.70 2017/01/16 00:11:09 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_sysent.c,v 1.71 2017/02/02 15:36:12 christos Exp $");
#include <sys/param.h>
#include <sys/poll.h>
@@ -1402,8 +1402,10 @@ struct sysent linux_sysent[] = {
.sy_call = linux_sys_nosys,
}, /* 333 = filler */
{
- .sy_call = linux_sys_nosys,
- }, /* 334 = filler */
+ ns(struct linux_sys_accept4_args),
+ .sy_flags = SYCALL_ARG_PTR,
+ .sy_call = (sy_call_t *)linux_sys_accept4
+ }, /* 334 = accept4 */
{
.sy_call = linux_sys_nosys,
}, /* 335 = filler */
