git: f0cfbffc3631 - main - syscalls: regen

From: Brooks Davis <brooks_at_FreeBSD.org>
Date: Mon, 22 Nov 2021 22:37:49 UTC
The branch main has been updated by brooks:

URL: https://cgit.FreeBSD.org/src/commit/?id=f0cfbffc3631aa1e7cab10aae7a25818dfe101c1

commit f0cfbffc3631aa1e7cab10aae7a25818dfe101c1
Author:     Brooks Davis <brooks@FreeBSD.org>
AuthorDate: 2021-11-22 22:36:56 +0000
Commit:     Brooks Davis <brooks@FreeBSD.org>
CommitDate: 2021-11-22 22:36:56 +0000

    syscalls: regen
---
 sys/amd64/linux/linux_systrace_args.c     | 50 +++++++++++++++----------------
 sys/amd64/linux32/linux32_systrace_args.c | 46 ++++++++++++++--------------
 sys/arm64/linux/linux_systrace_args.c     | 50 +++++++++++++++----------------
 sys/i386/linux/linux_systrace_args.c      | 40 ++++++++++++-------------
 4 files changed, 93 insertions(+), 93 deletions(-)

diff --git a/sys/amd64/linux/linux_systrace_args.c b/sys/amd64/linux/linux_systrace_args.c
index 9db01b6b7440..4093a29b6b8d 100644
--- a/sys/amd64/linux/linux_systrace_args.c
+++ b/sys/amd64/linux/linux_systrace_args.c
@@ -374,7 +374,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
 	case 42: {
 		struct linux_connect_args *p = params;
 		iarg[0] = p->s; /* l_int */
-		iarg[1] = p->name; /* l_uintptr_t */
+		uarg[1] = (intptr_t)p->name; /* l_uintptr_t */
 		iarg[2] = p->namelen; /* l_int */
 		*n_args = 3;
 		break;
@@ -383,8 +383,8 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
 	case 43: {
 		struct linux_accept_args *p = params;
 		iarg[0] = p->s; /* l_int */
-		iarg[1] = p->addr; /* l_uintptr_t */
-		iarg[2] = p->namelen; /* l_uintptr_t */
+		uarg[1] = (intptr_t)p->addr; /* l_uintptr_t */
+		uarg[2] = (intptr_t)p->namelen; /* l_uintptr_t */
 		*n_args = 3;
 		break;
 	}
@@ -392,10 +392,10 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
 	case 44: {
 		struct linux_sendto_args *p = params;
 		iarg[0] = p->s; /* l_int */
-		iarg[1] = p->msg; /* l_uintptr_t */
+		uarg[1] = (intptr_t)p->msg; /* l_uintptr_t */
 		iarg[2] = p->len; /* l_size_t */
 		iarg[3] = p->flags; /* l_uint */
-		iarg[4] = p->to; /* l_uintptr_t */
+		uarg[4] = (intptr_t)p->to; /* l_uintptr_t */
 		iarg[5] = p->tolen; /* l_int */
 		*n_args = 6;
 		break;
@@ -404,11 +404,11 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
 	case 45: {
 		struct linux_recvfrom_args *p = params;
 		iarg[0] = p->s; /* l_int */
-		iarg[1] = p->buf; /* l_uintptr_t */
+		uarg[1] = (intptr_t)p->buf; /* l_uintptr_t */
 		iarg[2] = p->len; /* l_size_t */
 		iarg[3] = p->flags; /* l_uint */
-		iarg[4] = p->from; /* l_uintptr_t */
-		iarg[5] = p->fromlen; /* l_uintptr_t */
+		uarg[4] = (intptr_t)p->from; /* l_uintptr_t */
+		uarg[5] = (intptr_t)p->fromlen; /* l_uintptr_t */
 		*n_args = 6;
 		break;
 	}
@@ -416,7 +416,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
 	case 46: {
 		struct linux_sendmsg_args *p = params;
 		iarg[0] = p->s; /* l_int */
-		iarg[1] = p->msg; /* l_uintptr_t */
+		uarg[1] = (intptr_t)p->msg; /* l_uintptr_t */
 		iarg[2] = p->flags; /* l_uint */
 		*n_args = 3;
 		break;
@@ -425,7 +425,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
 	case 47: {
 		struct linux_recvmsg_args *p = params;
 		iarg[0] = p->s; /* l_int */
-		iarg[1] = p->msg; /* l_uintptr_t */
+		uarg[1] = (intptr_t)p->msg; /* l_uintptr_t */
 		iarg[2] = p->flags; /* l_uint */
 		*n_args = 3;
 		break;
@@ -442,7 +442,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
 	case 49: {
 		struct linux_bind_args *p = params;
 		iarg[0] = p->s; /* l_int */
-		iarg[1] = p->name; /* l_uintptr_t */
+		uarg[1] = (intptr_t)p->name; /* l_uintptr_t */
 		iarg[2] = p->namelen; /* l_int */
 		*n_args = 3;
 		break;
@@ -459,8 +459,8 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
 	case 51: {
 		struct linux_getsockname_args *p = params;
 		iarg[0] = p->s; /* l_int */
-		iarg[1] = p->addr; /* l_uintptr_t */
-		iarg[2] = p->namelen; /* l_uintptr_t */
+		uarg[1] = (intptr_t)p->addr; /* l_uintptr_t */
+		uarg[2] = (intptr_t)p->namelen; /* l_uintptr_t */
 		*n_args = 3;
 		break;
 	}
@@ -468,8 +468,8 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
 	case 52: {
 		struct linux_getpeername_args *p = params;
 		iarg[0] = p->s; /* l_int */
-		iarg[1] = p->addr; /* l_uintptr_t */
-		iarg[2] = p->namelen; /* l_uintptr_t */
+		uarg[1] = (intptr_t)p->addr; /* l_uintptr_t */
+		uarg[2] = (intptr_t)p->namelen; /* l_uintptr_t */
 		*n_args = 3;
 		break;
 	}
@@ -479,7 +479,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
 		iarg[0] = p->domain; /* l_int */
 		iarg[1] = p->type; /* l_int */
 		iarg[2] = p->protocol; /* l_int */
-		iarg[3] = p->rsv; /* l_uintptr_t */
+		uarg[3] = (intptr_t)p->rsv; /* l_uintptr_t */
 		*n_args = 4;
 		break;
 	}
@@ -489,7 +489,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
 		iarg[0] = p->s; /* l_int */
 		iarg[1] = p->level; /* l_int */
 		iarg[2] = p->optname; /* l_int */
-		iarg[3] = p->optval; /* l_uintptr_t */
+		uarg[3] = (intptr_t)p->optval; /* l_uintptr_t */
 		iarg[4] = p->optlen; /* l_int */
 		*n_args = 5;
 		break;
@@ -500,8 +500,8 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
 		iarg[0] = p->s; /* l_int */
 		iarg[1] = p->level; /* l_int */
 		iarg[2] = p->optname; /* l_int */
-		iarg[3] = p->optval; /* l_uintptr_t */
-		iarg[4] = p->optlen; /* l_uintptr_t */
+		uarg[3] = (intptr_t)p->optval; /* l_uintptr_t */
+		uarg[4] = (intptr_t)p->optlen; /* l_uintptr_t */
 		*n_args = 5;
 		break;
 	}
@@ -1282,10 +1282,10 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
 	case 157: {
 		struct linux_prctl_args *p = params;
 		iarg[0] = p->option; /* l_int */
-		iarg[1] = p->arg2; /* l_uintptr_t */
-		iarg[2] = p->arg3; /* l_uintptr_t */
-		iarg[3] = p->arg4; /* l_uintptr_t */
-		iarg[4] = p->arg5; /* l_uintptr_t */
+		uarg[1] = (intptr_t)p->arg2; /* l_uintptr_t */
+		uarg[2] = (intptr_t)p->arg3; /* l_uintptr_t */
+		uarg[3] = (intptr_t)p->arg4; /* l_uintptr_t */
+		uarg[4] = (intptr_t)p->arg5; /* l_uintptr_t */
 		*n_args = 5;
 		break;
 	}
@@ -2201,8 +2201,8 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
 	case 288: {
 		struct linux_accept4_args *p = params;
 		iarg[0] = p->s; /* l_int */
-		iarg[1] = p->addr; /* l_uintptr_t */
-		iarg[2] = p->namelen; /* l_uintptr_t */
+		uarg[1] = (intptr_t)p->addr; /* l_uintptr_t */
+		uarg[2] = (intptr_t)p->namelen; /* l_uintptr_t */
 		iarg[3] = p->flags; /* l_int */
 		*n_args = 4;
 		break;
diff --git a/sys/amd64/linux32/linux32_systrace_args.c b/sys/amd64/linux32/linux32_systrace_args.c
index 8ff6242542f3..f3da83cf473f 100644
--- a/sys/amd64/linux32/linux32_systrace_args.c
+++ b/sys/amd64/linux32/linux32_systrace_args.c
@@ -355,7 +355,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
 		struct linux_ioctl_args *p = params;
 		iarg[0] = p->fd; /* l_uint */
 		iarg[1] = p->cmd; /* l_uint */
-		uarg[2] = p->arg; /* uintptr_t */
+		uarg[2] = (intptr_t)p->arg; /* uintptr_t */
 		*n_args = 3;
 		break;
 	}
@@ -364,7 +364,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
 		struct linux_fcntl_args *p = params;
 		iarg[0] = p->fd; /* l_uint */
 		iarg[1] = p->cmd; /* l_uint */
-		uarg[2] = p->arg; /* uintptr_t */
+		uarg[2] = (intptr_t)p->arg; /* uintptr_t */
 		*n_args = 3;
 		break;
 	}
@@ -786,7 +786,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
 		iarg[1] = p->arg1; /* l_int */
 		iarg[2] = p->arg2; /* l_int */
 		iarg[3] = p->arg3; /* l_uint */
-		iarg[4] = p->ptr; /* l_uintptr_t */
+		uarg[4] = (intptr_t)p->ptr; /* l_uintptr_t */
 		iarg[5] = p->arg5; /* l_uint */
 		*n_args = 6;
 		break;
@@ -1548,7 +1548,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
 		struct linux_fcntl64_args *p = params;
 		iarg[0] = p->fd; /* l_uint */
 		iarg[1] = p->cmd; /* l_uint */
-		uarg[2] = p->arg; /* uintptr_t */
+		uarg[2] = (intptr_t)p->arg; /* uintptr_t */
 		*n_args = 3;
 		break;
 	}
@@ -2625,7 +2625,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
 		iarg[0] = p->domain; /* l_int */
 		iarg[1] = p->type; /* l_int */
 		iarg[2] = p->protocol; /* l_int */
-		iarg[3] = p->rsv; /* l_uintptr_t */
+		uarg[3] = (intptr_t)p->rsv; /* l_uintptr_t */
 		*n_args = 4;
 		break;
 	}
@@ -2633,7 +2633,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
 	case 361: {
 		struct linux_bind_args *p = params;
 		iarg[0] = p->s; /* l_int */
-		iarg[1] = p->name; /* l_uintptr_t */
+		uarg[1] = (intptr_t)p->name; /* l_uintptr_t */
 		iarg[2] = p->namelen; /* l_int */
 		*n_args = 3;
 		break;
@@ -2642,7 +2642,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
 	case 362: {
 		struct linux_connect_args *p = params;
 		iarg[0] = p->s; /* l_int */
-		iarg[1] = p->name; /* l_uintptr_t */
+		uarg[1] = (intptr_t)p->name; /* l_uintptr_t */
 		iarg[2] = p->namelen; /* l_int */
 		*n_args = 3;
 		break;
@@ -2659,8 +2659,8 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
 	case 364: {
 		struct linux_accept4_args *p = params;
 		iarg[0] = p->s; /* l_int */
-		iarg[1] = p->addr; /* l_uintptr_t */
-		iarg[2] = p->namelen; /* l_uintptr_t */
+		uarg[1] = (intptr_t)p->addr; /* l_uintptr_t */
+		uarg[2] = (intptr_t)p->namelen; /* l_uintptr_t */
 		iarg[3] = p->flags; /* l_int */
 		*n_args = 4;
 		break;
@@ -2671,8 +2671,8 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
 		iarg[0] = p->s; /* l_int */
 		iarg[1] = p->level; /* l_int */
 		iarg[2] = p->optname; /* l_int */
-		iarg[3] = p->optval; /* l_uintptr_t */
-		iarg[4] = p->optlen; /* l_uintptr_t */
+		uarg[3] = (intptr_t)p->optval; /* l_uintptr_t */
+		uarg[4] = (intptr_t)p->optlen; /* l_uintptr_t */
 		*n_args = 5;
 		break;
 	}
@@ -2682,7 +2682,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
 		iarg[0] = p->s; /* l_int */
 		iarg[1] = p->level; /* l_int */
 		iarg[2] = p->optname; /* l_int */
-		iarg[3] = p->optval; /* l_uintptr_t */
+		uarg[3] = (intptr_t)p->optval; /* l_uintptr_t */
 		iarg[4] = p->optlen; /* l_int */
 		*n_args = 5;
 		break;
@@ -2691,8 +2691,8 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
 	case 367: {
 		struct linux_getsockname_args *p = params;
 		iarg[0] = p->s; /* l_int */
-		iarg[1] = p->addr; /* l_uintptr_t */
-		iarg[2] = p->namelen; /* l_uintptr_t */
+		uarg[1] = (intptr_t)p->addr; /* l_uintptr_t */
+		uarg[2] = (intptr_t)p->namelen; /* l_uintptr_t */
 		*n_args = 3;
 		break;
 	}
@@ -2700,8 +2700,8 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
 	case 368: {
 		struct linux_getpeername_args *p = params;
 		iarg[0] = p->s; /* l_int */
-		iarg[1] = p->addr; /* l_uintptr_t */
-		iarg[2] = p->namelen; /* l_uintptr_t */
+		uarg[1] = (intptr_t)p->addr; /* l_uintptr_t */
+		uarg[2] = (intptr_t)p->namelen; /* l_uintptr_t */
 		*n_args = 3;
 		break;
 	}
@@ -2709,10 +2709,10 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
 	case 369: {
 		struct linux_sendto_args *p = params;
 		iarg[0] = p->s; /* l_int */
-		iarg[1] = p->msg; /* l_uintptr_t */
+		uarg[1] = (intptr_t)p->msg; /* l_uintptr_t */
 		iarg[2] = p->len; /* l_int */
 		iarg[3] = p->flags; /* l_int */
-		iarg[4] = p->to; /* l_uintptr_t */
+		uarg[4] = (intptr_t)p->to; /* l_uintptr_t */
 		iarg[5] = p->tolen; /* l_int */
 		*n_args = 6;
 		break;
@@ -2721,7 +2721,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
 	case 370: {
 		struct linux_sendmsg_args *p = params;
 		iarg[0] = p->s; /* l_int */
-		iarg[1] = p->msg; /* l_uintptr_t */
+		uarg[1] = (intptr_t)p->msg; /* l_uintptr_t */
 		iarg[2] = p->flags; /* l_int */
 		*n_args = 3;
 		break;
@@ -2730,11 +2730,11 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
 	case 371: {
 		struct linux_recvfrom_args *p = params;
 		iarg[0] = p->s; /* l_int */
-		iarg[1] = p->buf; /* l_uintptr_t */
+		uarg[1] = (intptr_t)p->buf; /* l_uintptr_t */
 		iarg[2] = p->len; /* l_size_t */
 		iarg[3] = p->flags; /* l_int */
-		iarg[4] = p->from; /* l_uintptr_t */
-		iarg[5] = p->fromlen; /* l_uintptr_t */
+		uarg[4] = (intptr_t)p->from; /* l_uintptr_t */
+		uarg[5] = (intptr_t)p->fromlen; /* l_uintptr_t */
 		*n_args = 6;
 		break;
 	}
@@ -2742,7 +2742,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
 	case 372: {
 		struct linux_recvmsg_args *p = params;
 		iarg[0] = p->s; /* l_int */
-		iarg[1] = p->msg; /* l_uintptr_t */
+		uarg[1] = (intptr_t)p->msg; /* l_uintptr_t */
 		iarg[2] = p->flags; /* l_int */
 		*n_args = 3;
 		break;
diff --git a/sys/arm64/linux/linux_systrace_args.c b/sys/arm64/linux/linux_systrace_args.c
index 42f37dbff137..223548aff4c5 100644
--- a/sys/arm64/linux/linux_systrace_args.c
+++ b/sys/arm64/linux/linux_systrace_args.c
@@ -1317,10 +1317,10 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
 	case 167: {
 		struct linux_prctl_args *p = params;
 		iarg[0] = p->option; /* l_int */
-		iarg[1] = p->arg2; /* l_uintptr_t */
-		iarg[2] = p->arg3; /* l_uintptr_t */
-		iarg[3] = p->arg4; /* l_uintptr_t */
-		iarg[4] = p->arg5; /* l_uintptr_t */
+		uarg[1] = (intptr_t)p->arg2; /* l_uintptr_t */
+		uarg[2] = (intptr_t)p->arg3; /* l_uintptr_t */
+		uarg[3] = (intptr_t)p->arg4; /* l_uintptr_t */
+		uarg[4] = (intptr_t)p->arg5; /* l_uintptr_t */
 		*n_args = 5;
 		break;
 	}
@@ -1572,7 +1572,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
 		iarg[0] = p->domain; /* l_int */
 		iarg[1] = p->type; /* l_int */
 		iarg[2] = p->protocol; /* l_int */
-		iarg[3] = p->rsv; /* l_uintptr_t */
+		uarg[3] = (intptr_t)p->rsv; /* l_uintptr_t */
 		*n_args = 4;
 		break;
 	}
@@ -1580,7 +1580,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
 	case 200: {
 		struct linux_bind_args *p = params;
 		iarg[0] = p->s; /* l_int */
-		iarg[1] = p->name; /* l_uintptr_t */
+		uarg[1] = (intptr_t)p->name; /* l_uintptr_t */
 		iarg[2] = p->namelen; /* l_int */
 		*n_args = 3;
 		break;
@@ -1597,8 +1597,8 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
 	case 202: {
 		struct linux_accept_args *p = params;
 		iarg[0] = p->s; /* l_int */
-		iarg[1] = p->addr; /* l_uintptr_t */
-		iarg[2] = p->namelen; /* l_uintptr_t */
+		uarg[1] = (intptr_t)p->addr; /* l_uintptr_t */
+		uarg[2] = (intptr_t)p->namelen; /* l_uintptr_t */
 		*n_args = 3;
 		break;
 	}
@@ -1606,7 +1606,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
 	case 203: {
 		struct linux_connect_args *p = params;
 		iarg[0] = p->s; /* l_int */
-		iarg[1] = p->name; /* l_uintptr_t */
+		uarg[1] = (intptr_t)p->name; /* l_uintptr_t */
 		iarg[2] = p->namelen; /* l_int */
 		*n_args = 3;
 		break;
@@ -1615,8 +1615,8 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
 	case 204: {
 		struct linux_getsockname_args *p = params;
 		iarg[0] = p->s; /* l_int */
-		iarg[1] = p->addr; /* l_uintptr_t */
-		iarg[2] = p->namelen; /* l_uintptr_t */
+		uarg[1] = (intptr_t)p->addr; /* l_uintptr_t */
+		uarg[2] = (intptr_t)p->namelen; /* l_uintptr_t */
 		*n_args = 3;
 		break;
 	}
@@ -1624,8 +1624,8 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
 	case 205: {
 		struct linux_getpeername_args *p = params;
 		iarg[0] = p->s; /* l_int */
-		iarg[1] = p->addr; /* l_uintptr_t */
-		iarg[2] = p->namelen; /* l_uintptr_t */
+		uarg[1] = (intptr_t)p->addr; /* l_uintptr_t */
+		uarg[2] = (intptr_t)p->namelen; /* l_uintptr_t */
 		*n_args = 3;
 		break;
 	}
@@ -1633,10 +1633,10 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
 	case 206: {
 		struct linux_sendto_args *p = params;
 		iarg[0] = p->s; /* l_int */
-		iarg[1] = p->msg; /* l_uintptr_t */
+		uarg[1] = (intptr_t)p->msg; /* l_uintptr_t */
 		iarg[2] = p->len; /* l_size_t */
 		iarg[3] = p->flags; /* l_uint */
-		iarg[4] = p->to; /* l_uintptr_t */
+		uarg[4] = (intptr_t)p->to; /* l_uintptr_t */
 		iarg[5] = p->tolen; /* l_int */
 		*n_args = 6;
 		break;
@@ -1645,11 +1645,11 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
 	case 207: {
 		struct linux_recvfrom_args *p = params;
 		iarg[0] = p->s; /* l_int */
-		iarg[1] = p->buf; /* l_uintptr_t */
+		uarg[1] = (intptr_t)p->buf; /* l_uintptr_t */
 		iarg[2] = p->len; /* l_size_t */
 		iarg[3] = p->flags; /* l_uint */
-		iarg[4] = p->from; /* l_uintptr_t */
-		iarg[5] = p->fromlen; /* l_uintptr_t */
+		uarg[4] = (intptr_t)p->from; /* l_uintptr_t */
+		uarg[5] = (intptr_t)p->fromlen; /* l_uintptr_t */
 		*n_args = 6;
 		break;
 	}
@@ -1659,7 +1659,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
 		iarg[0] = p->s; /* l_int */
 		iarg[1] = p->level; /* l_int */
 		iarg[2] = p->optname; /* l_int */
-		iarg[3] = p->optval; /* l_uintptr_t */
+		uarg[3] = (intptr_t)p->optval; /* l_uintptr_t */
 		iarg[4] = p->optlen; /* l_int */
 		*n_args = 5;
 		break;
@@ -1670,8 +1670,8 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
 		iarg[0] = p->s; /* l_int */
 		iarg[1] = p->level; /* l_int */
 		iarg[2] = p->optname; /* l_int */
-		iarg[3] = p->optval; /* l_uintptr_t */
-		iarg[4] = p->optlen; /* l_uintptr_t */
+		uarg[3] = (intptr_t)p->optval; /* l_uintptr_t */
+		uarg[4] = (intptr_t)p->optlen; /* l_uintptr_t */
 		*n_args = 5;
 		break;
 	}
@@ -1687,7 +1687,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
 	case 211: {
 		struct linux_sendmsg_args *p = params;
 		iarg[0] = p->s; /* l_int */
-		iarg[1] = p->msg; /* l_uintptr_t */
+		uarg[1] = (intptr_t)p->msg; /* l_uintptr_t */
 		iarg[2] = p->flags; /* l_uint */
 		*n_args = 3;
 		break;
@@ -1696,7 +1696,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
 	case 212: {
 		struct linux_recvmsg_args *p = params;
 		iarg[0] = p->s; /* l_int */
-		iarg[1] = p->msg; /* l_uintptr_t */
+		uarg[1] = (intptr_t)p->msg; /* l_uintptr_t */
 		iarg[2] = p->flags; /* l_uint */
 		*n_args = 3;
 		break;
@@ -1909,8 +1909,8 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
 	case 242: {
 		struct linux_accept4_args *p = params;
 		iarg[0] = p->s; /* l_int */
-		iarg[1] = p->addr; /* l_uintptr_t */
-		iarg[2] = p->namelen; /* l_uintptr_t */
+		uarg[1] = (intptr_t)p->addr; /* l_uintptr_t */
+		uarg[2] = (intptr_t)p->namelen; /* l_uintptr_t */
 		iarg[3] = p->flags; /* l_int */
 		*n_args = 4;
 		break;
diff --git a/sys/i386/linux/linux_systrace_args.c b/sys/i386/linux/linux_systrace_args.c
index baee524e5a6d..0e13ff94aa57 100644
--- a/sys/i386/linux/linux_systrace_args.c
+++ b/sys/i386/linux/linux_systrace_args.c
@@ -815,7 +815,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
 		iarg[1] = p->arg1; /* l_int */
 		iarg[2] = p->arg2; /* l_int */
 		iarg[3] = p->arg3; /* l_uint */
-		iarg[4] = p->ptr; /* l_uintptr_t */
+		uarg[4] = (intptr_t)p->ptr; /* l_uintptr_t */
 		iarg[5] = p->arg5; /* l_uint */
 		*n_args = 6;
 		break;
@@ -2664,7 +2664,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
 		iarg[0] = p->domain; /* l_int */
 		iarg[1] = p->type; /* l_int */
 		iarg[2] = p->protocol; /* l_int */
-		iarg[3] = p->rsv; /* l_uintptr_t */
+		uarg[3] = (intptr_t)p->rsv; /* l_uintptr_t */
 		*n_args = 4;
 		break;
 	}
@@ -2672,7 +2672,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
 	case 361: {
 		struct linux_bind_args *p = params;
 		iarg[0] = p->s; /* l_int */
-		iarg[1] = p->name; /* l_uintptr_t */
+		uarg[1] = (intptr_t)p->name; /* l_uintptr_t */
 		iarg[2] = p->namelen; /* l_int */
 		*n_args = 3;
 		break;
@@ -2681,7 +2681,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
 	case 362: {
 		struct linux_connect_args *p = params;
 		iarg[0] = p->s; /* l_int */
-		iarg[1] = p->name; /* l_uintptr_t */
+		uarg[1] = (intptr_t)p->name; /* l_uintptr_t */
 		iarg[2] = p->namelen; /* l_int */
 		*n_args = 3;
 		break;
@@ -2698,8 +2698,8 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
 	case 364: {
 		struct linux_accept4_args *p = params;
 		iarg[0] = p->s; /* l_int */
-		iarg[1] = p->addr; /* l_uintptr_t */
-		iarg[2] = p->namelen; /* l_uintptr_t */
+		uarg[1] = (intptr_t)p->addr; /* l_uintptr_t */
+		uarg[2] = (intptr_t)p->namelen; /* l_uintptr_t */
 		iarg[3] = p->flags; /* l_int */
 		*n_args = 4;
 		break;
@@ -2710,8 +2710,8 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
 		iarg[0] = p->s; /* l_int */
 		iarg[1] = p->level; /* l_int */
 		iarg[2] = p->optname; /* l_int */
-		iarg[3] = p->optval; /* l_uintptr_t */
-		iarg[4] = p->optlen; /* l_uintptr_t */
+		uarg[3] = (intptr_t)p->optval; /* l_uintptr_t */
+		uarg[4] = (intptr_t)p->optlen; /* l_uintptr_t */
 		*n_args = 5;
 		break;
 	}
@@ -2721,7 +2721,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
 		iarg[0] = p->s; /* l_int */
 		iarg[1] = p->level; /* l_int */
 		iarg[2] = p->optname; /* l_int */
-		iarg[3] = p->optval; /* l_uintptr_t */
+		uarg[3] = (intptr_t)p->optval; /* l_uintptr_t */
 		iarg[4] = p->optlen; /* l_int */
 		*n_args = 5;
 		break;
@@ -2730,8 +2730,8 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
 	case 367: {
 		struct linux_getsockname_args *p = params;
 		iarg[0] = p->s; /* l_int */
-		iarg[1] = p->addr; /* l_uintptr_t */
-		iarg[2] = p->namelen; /* l_uintptr_t */
+		uarg[1] = (intptr_t)p->addr; /* l_uintptr_t */
+		uarg[2] = (intptr_t)p->namelen; /* l_uintptr_t */
 		*n_args = 3;
 		break;
 	}
@@ -2739,8 +2739,8 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
 	case 368: {
 		struct linux_getpeername_args *p = params;
 		iarg[0] = p->s; /* l_int */
-		iarg[1] = p->addr; /* l_uintptr_t */
-		iarg[2] = p->namelen; /* l_uintptr_t */
+		uarg[1] = (intptr_t)p->addr; /* l_uintptr_t */
+		uarg[2] = (intptr_t)p->namelen; /* l_uintptr_t */
 		*n_args = 3;
 		break;
 	}
@@ -2748,10 +2748,10 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
 	case 369: {
 		struct linux_sendto_args *p = params;
 		iarg[0] = p->s; /* l_int */
-		iarg[1] = p->msg; /* l_uintptr_t */
+		uarg[1] = (intptr_t)p->msg; /* l_uintptr_t */
 		iarg[2] = p->len; /* l_int */
 		iarg[3] = p->flags; /* l_int */
-		iarg[4] = p->to; /* l_uintptr_t */
+		uarg[4] = (intptr_t)p->to; /* l_uintptr_t */
 		iarg[5] = p->tolen; /* l_int */
 		*n_args = 6;
 		break;
@@ -2760,7 +2760,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
 	case 370: {
 		struct linux_sendmsg_args *p = params;
 		iarg[0] = p->s; /* l_int */
-		iarg[1] = p->msg; /* l_uintptr_t */
+		uarg[1] = (intptr_t)p->msg; /* l_uintptr_t */
 		iarg[2] = p->flags; /* l_int */
 		*n_args = 3;
 		break;
@@ -2769,11 +2769,11 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
 	case 371: {
 		struct linux_recvfrom_args *p = params;
 		iarg[0] = p->s; /* l_int */
-		iarg[1] = p->buf; /* l_uintptr_t */
+		uarg[1] = (intptr_t)p->buf; /* l_uintptr_t */
 		iarg[2] = p->len; /* l_size_t */
 		iarg[3] = p->flags; /* l_int */
-		iarg[4] = p->from; /* l_uintptr_t */
-		iarg[5] = p->fromlen; /* l_uintptr_t */
+		uarg[4] = (intptr_t)p->from; /* l_uintptr_t */
+		uarg[5] = (intptr_t)p->fromlen; /* l_uintptr_t */
 		*n_args = 6;
 		break;
 	}
@@ -2781,7 +2781,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
 	case 372: {
 		struct linux_recvmsg_args *p = params;
 		iarg[0] = p->s; /* l_int */
-		iarg[1] = p->msg; /* l_uintptr_t */
+		uarg[1] = (intptr_t)p->msg; /* l_uintptr_t */
 		iarg[2] = p->flags; /* l_int */
 		*n_args = 3;
 		break;