diff --git a/sys/compat/freebsd32/freebsd32_proto.h b/sys/compat/freebsd32/freebsd32_proto.h
index 62ac86e3494d..33f5a9957cfc 100644
--- a/sys/compat/freebsd32/freebsd32_proto.h
+++ b/sys/compat/freebsd32/freebsd32_proto.h
@@ -89,7 +89,7 @@ struct freebsd32_getitimer_args {
 struct freebsd32_fcntl_args {
 	char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
 	char cmd_l_[PADL_(int)]; int cmd; char cmd_r_[PADR_(int)];
-	char arg_l_[PADL_(int32_t)]; int32_t arg; char arg_r_[PADR_(int32_t)];
+	char arg_l_[PADL_(intptr32_t)]; intptr32_t arg; char arg_r_[PADR_(intptr32_t)];
 };
 struct freebsd32_select_args {
 	char nd_l_[PADL_(int)]; int nd; char nd_r_[PADR_(int)];
diff --git a/sys/compat/freebsd32/freebsd32_systrace_args.c b/sys/compat/freebsd32/freebsd32_systrace_args.c
index 6e796d417ecf..0a5a745191c2 100644
--- a/sys/compat/freebsd32/freebsd32_systrace_args.c
+++ b/sys/compat/freebsd32/freebsd32_systrace_args.c
@@ -527,7 +527,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
 		struct freebsd32_fcntl_args *p = params;
 		iarg[a++] = p->fd; /* int */
 		iarg[a++] = p->cmd; /* int */
-		uarg[a++] = (intptr_t)p->arg; /* int32_t */
+		uarg[a++] = (intptr_t)p->arg; /* intptr32_t */
 		*n_args = 3;
 		break;
 	}
@@ -1079,7 +1079,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
 		iarg[a++] = p->msqid; /* int */
 		uarg[a++] = (intptr_t)p->msgp; /* void * */
 		uarg[a++] = p->msgsz; /* size_t */
-		uarg[a++] = (intptr_t)p->msgtyp; /* int32_t */
+		iarg[a++] = p->msgtyp; /* int32_t */
 		iarg[a++] = p->msgflg; /* int */
 		*n_args = 5;
 		break;
@@ -1216,8 +1216,8 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
 	/* freebsd32_clock_getcpuclockid2 */
 	case 247: {
 		struct freebsd32_clock_getcpuclockid2_args *p = params;
-		uarg[a++] = (intptr_t)p->id1; /* uint32_t */
-		uarg[a++] = (intptr_t)p->id2; /* uint32_t */
+		uarg[a++] = p->id1; /* uint32_t */
+		uarg[a++] = p->id2; /* uint32_t */
 		iarg[a++] = p->which; /* int */
 		uarg[a++] = (intptr_t)p->clock_id; /* clockid_t * */
 		*n_args = 4;
@@ -1291,7 +1291,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
 	case 259: {
 		struct flag_captured_args *p = params;
 		uarg[a++] = (intptr_t)p->message; /* const char * */
-		uarg[a++] = (intptr_t)p->key; /* uint32_t */
+		uarg[a++] = p->key; /* uint32_t */
 		*n_args = 2;
 		break;
 	}
@@ -1320,8 +1320,8 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
 #ifdef PAD64_REQUIRED
 		iarg[a++] = p->_pad; /* int */
 #endif
-		uarg[a++] = (intptr_t)p->offset1; /* uint32_t */
-		uarg[a++] = (intptr_t)p->offset2; /* uint32_t */
+		uarg[a++] = p->offset1; /* uint32_t */
+		uarg[a++] = p->offset2; /* uint32_t */
 		*n_args = 6;
 		break;
 	}
@@ -1334,8 +1334,8 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
 #ifdef PAD64_REQUIRED
 		iarg[a++] = p->_pad; /* int */
 #endif
-		uarg[a++] = (intptr_t)p->offset1; /* uint32_t */
-		uarg[a++] = (intptr_t)p->offset2; /* uint32_t */
+		uarg[a++] = p->offset1; /* uint32_t */
+		uarg[a++] = p->offset2; /* uint32_t */
 		*n_args = 6;
 		break;
 	}
@@ -1843,8 +1843,8 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
 		struct freebsd32_sendfile_args *p = params;
 		iarg[a++] = p->fd; /* int */
 		iarg[a++] = p->s; /* int */
-		uarg[a++] = (intptr_t)p->offset1; /* uint32_t */
-		uarg[a++] = (intptr_t)p->offset2; /* uint32_t */
+		uarg[a++] = p->offset1; /* uint32_t */
+		uarg[a++] = p->offset2; /* uint32_t */
 		uarg[a++] = p->nbytes; /* size_t */
 		uarg[a++] = (intptr_t)p->hdtr; /* struct sf_hdtr32 * */
 		uarg[a++] = (intptr_t)p->sbytes; /* off_t * */
@@ -1864,28 +1864,28 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
 	/* ksem_close */
 	case 400: {
 		struct ksem_close_args *p = params;
-		uarg[a++] = (intptr_t)p->id; /* int32_t */
+		iarg[a++] = p->id; /* int32_t */
 		*n_args = 1;
 		break;
 	}
 	/* ksem_post */
 	case 401: {
 		struct ksem_post_args *p = params;
-		uarg[a++] = (intptr_t)p->id; /* int32_t */
+		iarg[a++] = p->id; /* int32_t */
 		*n_args = 1;
 		break;
 	}
 	/* ksem_wait */
 	case 402: {
 		struct ksem_wait_args *p = params;
-		uarg[a++] = (intptr_t)p->id; /* int32_t */
+		iarg[a++] = p->id; /* int32_t */
 		*n_args = 1;
 		break;
 	}
 	/* ksem_trywait */
 	case 403: {
 		struct ksem_trywait_args *p = params;
-		uarg[a++] = (intptr_t)p->id; /* int32_t */
+		iarg[a++] = p->id; /* int32_t */
 		*n_args = 1;
 		break;
 	}
@@ -1918,7 +1918,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
 	/* ksem_getvalue */
 	case 407: {
 		struct ksem_getvalue_args *p = params;
-		uarg[a++] = (intptr_t)p->id; /* int32_t */
+		iarg[a++] = p->id; /* int32_t */
 		uarg[a++] = (intptr_t)p->val; /* int * */
 		*n_args = 2;
 		break;
@@ -1926,7 +1926,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
 	/* ksem_destroy */
 	case 408: {
 		struct ksem_destroy_args *p = params;
-		uarg[a++] = (intptr_t)p->id; /* int32_t */
+		iarg[a++] = p->id; /* int32_t */
 		*n_args = 1;
 		break;
 	}
@@ -2059,7 +2059,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
 	/* thr_kill */
 	case 433: {
 		struct thr_kill_args *p = params;
-		uarg[a++] = (intptr_t)p->id; /* int32_t */
+		iarg[a++] = p->id; /* int32_t */
 		iarg[a++] = p->sig; /* int */
 		*n_args = 2;
 		break;
@@ -2104,7 +2104,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
 	/* freebsd32_ksem_timedwait */
 	case 441: {
 		struct freebsd32_ksem_timedwait_args *p = params;
-		uarg[a++] = (intptr_t)p->id; /* int32_t */
+		iarg[a++] = p->id; /* int32_t */
 		uarg[a++] = (intptr_t)p->abstime; /* const struct timespec32 * */
 		*n_args = 2;
 		break;
@@ -2119,7 +2119,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
 	/* thr_wake */
 	case 443: {
 		struct thr_wake_args *p = params;
-		uarg[a++] = (intptr_t)p->id; /* int32_t */
+		iarg[a++] = p->id; /* int32_t */
 		*n_args = 1;
 		break;
 	}
@@ -2295,7 +2295,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
 	/* thr_set_name */
 	case 464: {
 		struct thr_set_name_args *p = params;
-		uarg[a++] = (intptr_t)p->id; /* int32_t */
+		iarg[a++] = p->id; /* int32_t */
 		uarg[a++] = (intptr_t)p->name; /* const char * */
 		*n_args = 2;
 		break;
@@ -2321,7 +2321,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
 	case 471: {
 		struct sctp_peeloff_args *p = params;
 		iarg[a++] = p->sd; /* int */
-		uarg[a++] = (intptr_t)p->name; /* uint32_t */
+		uarg[a++] = p->name; /* uint32_t */
 		*n_args = 2;
 		break;
 	}
@@ -2373,8 +2373,8 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
 #ifdef PAD64_REQUIRED
 		iarg[a++] = p->_pad; /* int */
 #endif
-		uarg[a++] = (intptr_t)p->offset1; /* uint32_t */
-		uarg[a++] = (intptr_t)p->offset2; /* uint32_t */
+		uarg[a++] = p->offset1; /* uint32_t */
+		uarg[a++] = p->offset2; /* uint32_t */
 		*n_args = 6;
 		break;
 	}
@@ -2387,8 +2387,8 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
 #ifdef PAD64_REQUIRED
 		iarg[a++] = p->_pad; /* int */
 #endif
-		uarg[a++] = (intptr_t)p->offset1; /* uint32_t */
-		uarg[a++] = (intptr_t)p->offset2; /* uint32_t */
+		uarg[a++] = p->offset1; /* uint32_t */
+		uarg[a++] = p->offset2; /* uint32_t */
 		*n_args = 6;
 		break;
 	}
@@ -2403,8 +2403,8 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
 #ifdef PAD64_REQUIRED
 		iarg[a++] = p->_pad; /* int */
 #endif
-		uarg[a++] = (intptr_t)p->pos1; /* uint32_t */
-		uarg[a++] = (intptr_t)p->pos2; /* uint32_t */
+		uarg[a++] = p->pos1; /* uint32_t */
+		uarg[a++] = p->pos2; /* uint32_t */
 		*n_args = 8;
 		break;
 	}
@@ -2415,8 +2415,8 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
 #ifdef PAD64_REQUIRED
 		iarg[a++] = p->_pad; /* int */
 #endif
-		uarg[a++] = (intptr_t)p->offset1; /* uint32_t */
-		uarg[a++] = (intptr_t)p->offset2; /* uint32_t */
+		uarg[a++] = p->offset1; /* uint32_t */
+		uarg[a++] = p->offset2; /* uint32_t */
 		iarg[a++] = p->whence; /* int */
 		*n_args = 5;
 		break;
@@ -2428,8 +2428,8 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
 #ifdef PAD64_REQUIRED
 		iarg[a++] = p->_pad; /* int */
 #endif
-		uarg[a++] = (intptr_t)p->length1; /* uint32_t */
-		uarg[a++] = (intptr_t)p->length2; /* uint32_t */
+		uarg[a++] = p->length1; /* uint32_t */
+		uarg[a++] = p->length2; /* uint32_t */
 		*n_args = 4;
 		break;
 	}
@@ -2440,8 +2440,8 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
 #ifdef PAD64_REQUIRED
 		iarg[a++] = p->_pad; /* int */
 #endif
-		uarg[a++] = (intptr_t)p->length1; /* uint32_t */
-		uarg[a++] = (intptr_t)p->length2; /* uint32_t */
+		uarg[a++] = p->length1; /* uint32_t */
+		uarg[a++] = p->length2; /* uint32_t */
 		*n_args = 4;
 		break;
 	}
@@ -2449,7 +2449,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
 	case 481: {
 		struct thr_kill2_args *p = params;
 		iarg[a++] = p->pid; /* pid_t */
-		uarg[a++] = (intptr_t)p->id; /* int32_t */
+		iarg[a++] = p->id; /* int32_t */
 		iarg[a++] = p->sig; /* int */
 		*n_args = 3;
 		break;
@@ -2475,8 +2475,8 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
 #ifdef PAD64_REQUIRED
 		iarg[a++] = p->_pad; /* int */
 #endif
-		uarg[a++] = (intptr_t)p->id1; /* uint32_t */
-		uarg[a++] = (intptr_t)p->id2; /* uint32_t */
+		uarg[a++] = p->id1; /* uint32_t */
+		uarg[a++] = p->id2; /* uint32_t */
 		iarg[a++] = p->setid; /* cpusetid_t */
 		*n_args = 5;
 		break;
@@ -2486,8 +2486,8 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
 		struct freebsd32_cpuset_getid_args *p = params;
 		iarg[a++] = p->level; /* cpulevel_t */
 		iarg[a++] = p->which; /* cpuwhich_t */
-		uarg[a++] = (intptr_t)p->id1; /* uint32_t */
-		uarg[a++] = (intptr_t)p->id2; /* uint32_t */
+		uarg[a++] = p->id1; /* uint32_t */
+		uarg[a++] = p->id2; /* uint32_t */
 		uarg[a++] = (intptr_t)p->setid; /* cpusetid_t * */
 		*n_args = 5;
 		break;
@@ -2497,8 +2497,8 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
 		struct freebsd32_cpuset_getaffinity_args *p = params;
 		iarg[a++] = p->level; /* cpulevel_t */
 		iarg[a++] = p->which; /* cpuwhich_t */
-		uarg[a++] = (intptr_t)p->id1; /* uint32_t */
-		uarg[a++] = (intptr_t)p->id2; /* uint32_t */
+		uarg[a++] = p->id1; /* uint32_t */
+		uarg[a++] = p->id2; /* uint32_t */
 		uarg[a++] = p->cpusetsize; /* size_t */
 		uarg[a++] = (intptr_t)p->mask; /* cpuset_t * */
 		*n_args = 6;
@@ -2509,8 +2509,8 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
 		struct freebsd32_cpuset_setaffinity_args *p = params;
 		iarg[a++] = p->level; /* cpulevel_t */
 		iarg[a++] = p->which; /* cpuwhich_t */
-		uarg[a++] = (intptr_t)p->id1; /* uint32_t */
-		uarg[a++] = (intptr_t)p->id2; /* uint32_t */
+		uarg[a++] = p->id1; /* uint32_t */
+		uarg[a++] = p->id2; /* uint32_t */
 		uarg[a++] = p->cpusetsize; /* size_t */
 		uarg[a++] = (intptr_t)p->mask; /* const cpuset_t * */
 		*n_args = 6;
@@ -2846,10 +2846,10 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
 #ifdef PAD64_REQUIRED
 		iarg[a++] = p->_pad; /* int */
 #endif
-		uarg[a++] = (intptr_t)p->offset1; /* uint32_t */
-		uarg[a++] = (intptr_t)p->offset2; /* uint32_t */
-		uarg[a++] = (intptr_t)p->len1; /* uint32_t */
-		uarg[a++] = (intptr_t)p->len2; /* uint32_t */
+		uarg[a++] = p->offset1; /* uint32_t */
+		uarg[a++] = p->offset2; /* uint32_t */
+		uarg[a++] = p->len1; /* uint32_t */
+		uarg[a++] = p->len2; /* uint32_t */
 		*n_args = 6;
 		break;
 	}
@@ -2860,10 +2860,10 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
 #ifdef PAD64_REQUIRED
 		iarg[a++] = p->_pad; /* int */
 #endif
-		uarg[a++] = (intptr_t)p->offset1; /* uint32_t */
-		uarg[a++] = (intptr_t)p->offset2; /* uint32_t */
-		uarg[a++] = (intptr_t)p->len1; /* uint32_t */
-		uarg[a++] = (intptr_t)p->len2; /* uint32_t */
+		uarg[a++] = p->offset1; /* uint32_t */
+		uarg[a++] = p->offset2; /* uint32_t */
+		uarg[a++] = p->len1; /* uint32_t */
+		uarg[a++] = p->len2; /* uint32_t */
 		iarg[a++] = p->advice; /* int */
 		*n_args = 7;
 		break;
@@ -2875,8 +2875,8 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
 #ifdef PAD64_REQUIRED
 		iarg[a++] = p->_pad; /* int */
 #endif
-		uarg[a++] = (intptr_t)p->id1; /* uint32_t */
-		uarg[a++] = (intptr_t)p->id2; /* uint32_t */
+		uarg[a++] = p->id1; /* uint32_t */
+		uarg[a++] = p->id2; /* uint32_t */
 		uarg[a++] = (intptr_t)p->status; /* int * */
 		iarg[a++] = p->options; /* int */
 		uarg[a++] = (intptr_t)p->wrusage; /* struct __wrusage32 * */
@@ -2914,7 +2914,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
 	case 536: {
 		struct cap_fcntls_limit_args *p = params;
 		iarg[a++] = p->fd; /* int */
-		uarg[a++] = (intptr_t)p->fcntlrights; /* uint32_t */
+		uarg[a++] = p->fcntlrights; /* uint32_t */
 		*n_args = 2;
 		break;
 	}
@@ -2988,8 +2988,8 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
 #ifdef PAD64_REQUIRED
 		iarg[a++] = p->_pad; /* int */
 #endif
-		uarg[a++] = (intptr_t)p->id1; /* uint32_t */
-		uarg[a++] = (intptr_t)p->id2; /* uint32_t */
+		uarg[a++] = p->id1; /* uint32_t */
+		uarg[a++] = p->id2; /* uint32_t */
 		iarg[a++] = p->com; /* int */
 		uarg[a++] = (intptr_t)p->data; /* void * */
 		*n_args = 6;
@@ -3086,7 +3086,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
 	case 557: {
 		struct freebsd32_getfsstat_args *p = params;
 		uarg[a++] = (intptr_t)p->buf; /* struct statfs * */
-		uarg[a++] = (intptr_t)p->bufsize; /* int32_t */
+		iarg[a++] = p->bufsize; /* int32_t */
 		iarg[a++] = p->mode; /* int */
 		*n_args = 3;
 		break;
@@ -3108,8 +3108,8 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
 #ifdef PAD64_REQUIRED
 		iarg[a++] = p->_pad; /* int */
 #endif
-		uarg[a++] = (intptr_t)p->dev1; /* uint32_t */
-		uarg[a++] = (intptr_t)p->dev2; /* uint32_t */
+		uarg[a++] = p->dev1; /* uint32_t */
+		uarg[a++] = p->dev2; /* uint32_t */
 		*n_args = 6;
 		break;
 	}
@@ -3130,8 +3130,8 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
 		struct freebsd32_cpuset_getdomain_args *p = params;
 		iarg[a++] = p->level; /* cpulevel_t */
 		iarg[a++] = p->which; /* cpuwhich_t */
-		uarg[a++] = (intptr_t)p->id1; /* uint32_t */
-		uarg[a++] = (intptr_t)p->id2; /* uint32_t */
+		uarg[a++] = p->id1; /* uint32_t */
+		uarg[a++] = p->id2; /* uint32_t */
 		uarg[a++] = p->domainsetsize; /* size_t */
 		uarg[a++] = (intptr_t)p->mask; /* domainset_t * */
 		uarg[a++] = (intptr_t)p->policy; /* int * */
@@ -3143,8 +3143,8 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
 		struct freebsd32_cpuset_setdomain_args *p = params;
 		iarg[a++] = p->level; /* cpulevel_t */
 		iarg[a++] = p->which; /* cpuwhich_t */
-		uarg[a++] = (intptr_t)p->id1; /* uint32_t */
-		uarg[a++] = (intptr_t)p->id2; /* uint32_t */
+		uarg[a++] = p->id1; /* uint32_t */
+		uarg[a++] = p->id2; /* uint32_t */
 		uarg[a++] = p->domainsetsize; /* size_t */
 		uarg[a++] = (intptr_t)p->mask; /* domainset_t * */
 		iarg[a++] = p->policy; /* int */
@@ -3381,8 +3381,8 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
 		iarg[a++] = p->pid1; /* pid_t */
 		iarg[a++] = p->pid2; /* pid_t */
 		iarg[a++] = p->type; /* int */
-		uarg[a++] = (intptr_t)p->idx1; /* uint32_t */
-		uarg[a++] = (intptr_t)p->idx2; /* uint32_t */
+		uarg[a++] = (intptr_t)p->idx1; /* uintptr32_t */
+		uarg[a++] = (intptr_t)p->idx2; /* uintptr32_t */
 		*n_args = 5;
 		break;
 	}
@@ -4192,7 +4192,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
 			p = "int";
 			break;
 		case 2:
-			p = "int32_t";
+			p = "intptr32_t";
 			break;
 		default:
 			break;
@@ -9141,10 +9141,10 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
 			p = "int";
 			break;
 		case 3:
-			p = "uint32_t";
+			p = "uintptr32_t";
 			break;
 		case 4:
-			p = "uint32_t";
+			p = "uintptr32_t";
 			break;
 		default:
 			break;
diff --git a/sys/compat/freebsd64/freebsd64_proto.h b/sys/compat/freebsd64/freebsd64_proto.h
index 9f78d91f91dc..60f281f34f29 100644
--- a/sys/compat/freebsd64/freebsd64_proto.h
+++ b/sys/compat/freebsd64/freebsd64_proto.h
@@ -234,7 +234,7 @@ struct freebsd64_cheri_cidcap_alloc_args {
 struct freebsd64_fcntl_args {
 	char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
 	char cmd_l_[PADL_(int)]; int cmd; char cmd_r_[PADR_(int)];
-	char arg_l_[PADL_(int64_t)]; int64_t arg; char arg_r_[PADR_(int64_t)];
+	char arg_l_[PADL_(intptr64_t)]; intptr64_t arg; char arg_r_[PADR_(intptr64_t)];
 };
 struct freebsd64_select_args {
 	char nd_l_[PADL_(int)]; int nd; char nd_r_[PADR_(int)];
@@ -1513,8 +1513,8 @@ struct freebsd64_kcmp_args {
 	char pid1_l_[PADL_(pid_t)]; pid_t pid1; char pid1_r_[PADR_(pid_t)];
 	char pid2_l_[PADL_(pid_t)]; pid_t pid2; char pid2_r_[PADR_(pid_t)];
 	char type_l_[PADL_(int)]; int type; char type_r_[PADR_(int)];
-	char idx1_l_[PADL_(uint64_t)]; uint64_t idx1; char idx1_r_[PADR_(uint64_t)];
-	char idx2_l_[PADL_(uint64_t)]; uint64_t idx2; char idx2_r_[PADR_(uint64_t)];
+	char idx1_l_[PADL_(uintptr64_t)]; uintptr64_t idx1; char idx1_r_[PADR_(uintptr64_t)];
+	char idx2_l_[PADL_(uintptr64_t)]; uintptr64_t idx2; char idx2_r_[PADR_(uintptr64_t)];
 };
 int	freebsd64_read(struct thread *, struct freebsd64_read_args *);
 int	freebsd64_write(struct thread *, struct freebsd64_write_args *);
diff --git a/sys/compat/freebsd64/freebsd64_syscall.h b/sys/compat/freebsd64/freebsd64_syscall.h
index 44ca106b3d17..ba6bf95ec6e2 100644
--- a/sys/compat/freebsd64/freebsd64_syscall.h
+++ b/sys/compat/freebsd64/freebsd64_syscall.h
@@ -188,7 +188,7 @@
 #define	FREEBSD64_SYS_freebsd64_setrlimit	195
 #define	FREEBSD64_SYS_freebsd11_freebsd64_getdirentries	196
 				/* 197 is freebsd6 freebsd64_mmap */
-#define	FREEBSD64_SYS_freebsd64___syscall	198
+#define	FREEBSD64_SYS___syscall	198
 				/* 199 is freebsd6 lseek */
 				/* 200 is freebsd6 freebsd64_truncate */
 				/* 201 is freebsd6 ftruncate */
diff --git a/sys/compat/freebsd64/freebsd64_syscall.mk b/sys/compat/freebsd64/freebsd64_syscall.mk
index 77765b80bfc1..acaeed1ec7fd 100644
--- a/sys/compat/freebsd64/freebsd64_syscall.mk
+++ b/sys/compat/freebsd64/freebsd64_syscall.mk
@@ -125,7 +125,7 @@ MIASM =  \
 	freebsd64_getrlimit.o \
 	freebsd64_setrlimit.o \
 	freebsd11_freebsd64_getdirentries.o \
-	freebsd64___syscall.o \
+	__syscall.o \
 	freebsd64___sysctl.o \
 	freebsd64_mlock.o \
 	freebsd64_munlock.o \
diff --git a/sys/compat/freebsd64/freebsd64_syscalls.c b/sys/compat/freebsd64/freebsd64_syscalls.c
index a570e631fd82..456d3a395d80 100644
--- a/sys/compat/freebsd64/freebsd64_syscalls.c
+++ b/sys/compat/freebsd64/freebsd64_syscalls.c
@@ -203,7 +203,7 @@ const char *freebsd64_syscallnames[] = {
 	"freebsd64_setrlimit",			/* 195 = freebsd64_setrlimit */
 	"compat11.freebsd64_getdirentries",		/* 196 = freebsd11 freebsd64_getdirentries */
 	"compat6.freebsd64_mmap",		/* 197 = freebsd6 freebsd64_mmap */
-	"freebsd64___syscall",			/* 198 = freebsd64___syscall */
+	"__syscall",			/* 198 = __syscall */
 	"compat6.lseek",		/* 199 = freebsd6 lseek */
 	"compat6.freebsd64_truncate",		/* 200 = freebsd6 freebsd64_truncate */
 	"compat6.ftruncate",		/* 201 = freebsd6 ftruncate */
diff --git a/sys/compat/freebsd64/freebsd64_sysent.c b/sys/compat/freebsd64/freebsd64_sysent.c
index a06cfdea5ee3..6bbb19a3d104 100644
--- a/sys/compat/freebsd64/freebsd64_sysent.c
+++ b/sys/compat/freebsd64/freebsd64_sysent.c
@@ -247,7 +247,7 @@ struct sysent freebsd64_sysent[] = {
 	{ .sy_narg = AS(freebsd64_setrlimit_args), .sy_call = (sy_call_t *)freebsd64_setrlimit, .sy_auevent = AUE_SETRLIMIT, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC },	/* 195 = freebsd64_setrlimit */
 	{ compat11(AS(freebsd11_freebsd64_getdirentries_args),freebsd64_getdirentries), .sy_auevent = AUE_GETDIRENTRIES, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC },	/* 196 = freebsd11 freebsd64_getdirentries */
 	{ compat6(AS(freebsd6_freebsd64_mmap_args),freebsd64_mmap), .sy_auevent = AUE_MMAP, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC },	/* 197 = freebsd6 freebsd64_mmap */
-	{ .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC },		/* 198 = freebsd64___syscall */
+	{ .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC },		/* 198 = __syscall */
 	{ compat6(AS(freebsd6_lseek_args),lseek), .sy_auevent = AUE_LSEEK, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC },	/* 199 = freebsd6 lseek */
 	{ compat6(AS(freebsd6_freebsd64_truncate_args),freebsd64_truncate), .sy_auevent = AUE_TRUNCATE, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC },	/* 200 = freebsd6 freebsd64_truncate */
 	{ compat6(AS(freebsd6_ftruncate_args),ftruncate), .sy_auevent = AUE_FTRUNCATE, .sy_flags = SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC },	/* 201 = freebsd6 ftruncate */
diff --git a/sys/compat/freebsd64/freebsd64_systrace_args.c b/sys/compat/freebsd64/freebsd64_systrace_args.c
index 2a8c093cd767..fc9bc36b0096 100644
--- a/sys/compat/freebsd64/freebsd64_systrace_args.c
+++ b/sys/compat/freebsd64/freebsd64_systrace_args.c
@@ -531,7 +531,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
 		struct freebsd64_fcntl_args *p = params;
 		iarg[a++] = p->fd; /* int */
 		iarg[a++] = p->cmd; /* int */
-		uarg[a++] = (intptr_t)p->arg; /* int64_t */
+		uarg[a++] = (intptr_t)p->arg; /* intptr64_t */
 		*n_args = 3;
 		break;
 	}
@@ -953,7 +953,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
 		*n_args = 2;
 		break;
 	}
-	/* freebsd64___syscall */
+	/* __syscall */
 	case 198: {
 		*n_args = 0;
 		break;
@@ -3475,8 +3475,8 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
 		iarg[a++] = p->pid1; /* pid_t */
 		iarg[a++] = p->pid2; /* pid_t */
 		iarg[a++] = p->type; /* int */
-		uarg[a++] = (intptr_t)p->idx1; /* uint64_t */
-		uarg[a++] = (intptr_t)p->idx2; /* uint64_t */
+		uarg[a++] = (intptr_t)p->idx1; /* uintptr64_t */
+		uarg[a++] = (intptr_t)p->idx2; /* uintptr64_t */
 		*n_args = 5;
 		break;
 	}
@@ -4296,7 +4296,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
 			p = "int";
 			break;
 		case 2:
-			p = "int64_t";
+			p = "intptr64_t";
 			break;
 		default:
 			break;
@@ -5016,7 +5016,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
 			break;
 		};
 		break;
-	/* freebsd64___syscall */
+	/* __syscall */
 	case 198:
 		break;
 	/* freebsd64___sysctl */
@@ -9303,10 +9303,10 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
 			p = "int";
 			break;
 		case 3:
-			p = "uint64_t";
+			p = "uintptr64_t";
 			break;
 		case 4:
-			p = "uint64_t";
+			p = "uintptr64_t";
 			break;
 		default:
 			break;
@@ -9869,7 +9869,7 @@ systrace_return_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
 		if (ndx == 0 || ndx == 1)
 			p = "int";
 		break;
-	/* freebsd64___syscall */
+	/* __syscall */
 	case 198:
 	/* freebsd64___sysctl */
 	case 202: