Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 18 Jun 2018 18:10:12 +0000 (UTC)
From:      Ed Maste <emaste@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r335324 - head/sys/arm64/linux
Message-ID:  <201806181810.w5IIACFI086140@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: emaste
Date: Mon Jun 18 18:10:11 2018
New Revision: 335324
URL: https://svnweb.freebsd.org/changeset/base/335324

Log:
  Regen arm64 linuxulator sysent files after r335323

Modified:
  head/sys/arm64/linux/linux_syscall.h
  head/sys/arm64/linux/linux_syscalls.c
  head/sys/arm64/linux/linux_sysent.c
  head/sys/arm64/linux/linux_systrace_args.c

Modified: head/sys/arm64/linux/linux_syscall.h
==============================================================================
--- head/sys/arm64/linux/linux_syscall.h	Mon Jun 18 18:08:19 2018	(r335323)
+++ head/sys/arm64/linux/linux_syscall.h	Mon Jun 18 18:10:11 2018	(r335324)
@@ -23,6 +23,7 @@
 #define	LINUX_SYS_linux_epoll_create1	20
 #define	LINUX_SYS_linux_epoll_ctl	21
 #define	LINUX_SYS_linux_epoll_pwait	22
+#define	LINUX_SYS_dup	23
 #define	LINUX_SYS_linux_dup3	24
 #define	LINUX_SYS_linux_fcntl	25
 #define	LINUX_SYS_linux_inotify_init1	26

Modified: head/sys/arm64/linux/linux_syscalls.c
==============================================================================
--- head/sys/arm64/linux/linux_syscalls.c	Mon Jun 18 18:08:19 2018	(r335323)
+++ head/sys/arm64/linux/linux_syscalls.c	Mon Jun 18 18:10:11 2018	(r335324)
@@ -30,7 +30,7 @@ const char *linux_syscallnames[] = {
 	"linux_epoll_create1",			/* 20 = linux_epoll_create1 */
 	"linux_epoll_ctl",			/* 21 = linux_epoll_ctl */
 	"linux_epoll_pwait",			/* 22 = linux_epoll_pwait */
-	"#23",			/* 23 = linux_dup */
+	"dup",			/* 23 = dup */
 	"linux_dup3",			/* 24 = linux_dup3 */
 	"linux_fcntl",			/* 25 = linux_fcntl */
 	"linux_inotify_init1",			/* 26 = linux_inotify_init1 */

Modified: head/sys/arm64/linux/linux_sysent.c
==============================================================================
--- head/sys/arm64/linux/linux_sysent.c	Mon Jun 18 18:08:19 2018	(r335323)
+++ head/sys/arm64/linux/linux_sysent.c	Mon Jun 18 18:10:11 2018	(r335324)
@@ -40,7 +40,7 @@ struct sysent linux_sysent[] = {
 	{ AS(linux_epoll_create1_args), (sy_call_t *)linux_epoll_create1, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 20 = linux_epoll_create1 */
 	{ AS(linux_epoll_ctl_args), (sy_call_t *)linux_epoll_ctl, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 21 = linux_epoll_ctl */
 	{ AS(linux_epoll_pwait_args), (sy_call_t *)linux_epoll_pwait, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 22 = linux_epoll_pwait */
-	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 23 = linux_dup */
+	{ AS(dup_args), (sy_call_t *)sys_dup, AUE_DUP, NULL, 0, 0, 0, SY_THR_STATIC },	/* 23 = dup */
 	{ AS(linux_dup3_args), (sy_call_t *)linux_dup3, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 24 = linux_dup3 */
 	{ AS(linux_fcntl_args), (sy_call_t *)linux_fcntl, AUE_FCNTL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 25 = linux_fcntl */
 	{ AS(linux_inotify_init1_args), (sy_call_t *)linux_inotify_init1, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 26 = linux_inotify_init1 */

Modified: head/sys/arm64/linux/linux_systrace_args.c
==============================================================================
--- head/sys/arm64/linux/linux_systrace_args.c	Mon Jun 18 18:08:19 2018	(r335323)
+++ head/sys/arm64/linux/linux_systrace_args.c	Mon Jun 18 18:10:11 2018	(r335324)
@@ -122,6 +122,13 @@ systrace_args(int sysnum, void *params, uint64_t *uarg
 		*n_args = 6;
 		break;
 	}
+	/* dup */
+	case 23: {
+		struct dup_args *p = params;
+		uarg[0] = p->fd; /* u_int */
+		*n_args = 1;
+		break;
+	}
 	/* linux_dup3 */
 	case 24: {
 		struct linux_dup3_args *p = params;
@@ -2234,6 +2241,16 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *d
 			break;
 		};
 		break;
+	/* dup */
+	case 23:
+		switch(ndx) {
+		case 0:
+			p = "u_int";
+			break;
+		default:
+			break;
+		};
+		break;
 	/* linux_dup3 */
 	case 24:
 		switch(ndx) {
@@ -5496,6 +5513,11 @@ systrace_return_setargdesc(int sysnum, int ndx, char *
 		break;
 	/* linux_epoll_pwait */
 	case 22:
+		if (ndx == 0 || ndx == 1)
+			p = "int";
+		break;
+	/* dup */
+	case 23:
 		if (ndx == 0 || ndx == 1)
 			p = "int";
 		break;



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201806181810.w5IIACFI086140>