4 files changed, 18 insertions, 18 deletions

diff --git a/sys/amd64/linux32/linux32_proto.h b/sys/amd64/linux32/linux32_proto.h
index 43064d5773bd7..e015395a1d75c 100644
--- a/sys/amd64/linux32/linux32_proto.h
+++ b/sys/amd64/linux32/linux32_proto.h
@@ -369,9 +369,9 @@ struct linux_ipc_args {
 	char what_l_[PADL_(l_uint)]; l_uint what; char what_r_[PADR_(l_uint)];
 	char arg1_l_[PADL_(l_int)]; l_int arg1; char arg1_r_[PADR_(l_int)];
 	char arg2_l_[PADL_(l_int)]; l_int arg2; char arg2_r_[PADR_(l_int)];
-	char arg3_l_[PADL_(l_int)]; l_int arg3; char arg3_r_[PADR_(l_int)];
-	char ptr_l_[PADL_(void *)]; void * ptr; char ptr_r_[PADR_(void *)];
-	char arg5_l_[PADL_(l_long)]; l_long arg5; char arg5_r_[PADR_(l_long)];
+	char arg3_l_[PADL_(l_uint)]; l_uint arg3; char arg3_r_[PADR_(l_uint)];
+	char ptr_l_[PADL_(l_uintptr_t)]; l_uintptr_t ptr; char ptr_r_[PADR_(l_uintptr_t)];
+	char arg5_l_[PADL_(l_uint)]; l_uint arg5; char arg5_r_[PADR_(l_uint)];
 };
 struct linux_sigreturn_args {
 	char sfp_l_[PADL_(struct l_sigframe *)]; struct l_sigframe * sfp; char sfp_r_[PADR_(struct l_sigframe *)];
diff --git a/sys/amd64/linux32/linux32_systrace_args.c b/sys/amd64/linux32/linux32_systrace_args.c
index b9335c716c87f..5dc07d4248a50 100644
--- a/sys/amd64/linux32/linux32_systrace_args.c
+++ b/sys/amd64/linux32/linux32_systrace_args.c
@@ -785,9 +785,9 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
 		iarg[0] = p->what; /* l_uint */
 		iarg[1] = p->arg1; /* l_int */
 		iarg[2] = p->arg2; /* l_int */
-		iarg[3] = p->arg3; /* l_int */
-		uarg[4] = (intptr_t) p->ptr; /* void * */
-		iarg[5] = p->arg5; /* l_long */
+		iarg[3] = p->arg3; /* l_uint */
+		iarg[4] = p->ptr; /* l_uintptr_t */
+		iarg[5] = p->arg5; /* l_uint */
 		*n_args = 6;
 		break;
 	}
@@ -3894,13 +3894,13 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
 			p = "l_int";
 			break;
 		case 3:
-			p = "l_int";
+			p = "l_uint";
 			break;
 		case 4:
-			p = "userland void *";
+			p = "l_uintptr_t";
 			break;
 		case 5:
-			p = "l_long";
+			p = "l_uint";
 			break;
 		default:
 			break;
diff --git a/sys/i386/linux/linux_proto.h b/sys/i386/linux/linux_proto.h
index 72cc4ad24bae3..b2b287a538d1f 100644
--- a/sys/i386/linux/linux_proto.h
+++ b/sys/i386/linux/linux_proto.h
@@ -372,9 +372,9 @@ struct linux_ipc_args {
 	char what_l_[PADL_(l_uint)]; l_uint what; char what_r_[PADR_(l_uint)];
 	char arg1_l_[PADL_(l_int)]; l_int arg1; char arg1_r_[PADR_(l_int)];
 	char arg2_l_[PADL_(l_int)]; l_int arg2; char arg2_r_[PADR_(l_int)];
-	char arg3_l_[PADL_(l_int)]; l_int arg3; char arg3_r_[PADR_(l_int)];
-	char ptr_l_[PADL_(void *)]; void * ptr; char ptr_r_[PADR_(void *)];
-	char arg5_l_[PADL_(l_long)]; l_long arg5; char arg5_r_[PADR_(l_long)];
+	char arg3_l_[PADL_(l_uint)]; l_uint arg3; char arg3_r_[PADR_(l_uint)];
+	char ptr_l_[PADL_(l_uintptr_t)]; l_uintptr_t ptr; char ptr_r_[PADR_(l_uintptr_t)];
+	char arg5_l_[PADL_(l_uint)]; l_uint arg5; char arg5_r_[PADR_(l_uint)];
 };
 struct linux_sigreturn_args {
 	char sfp_l_[PADL_(struct l_sigframe *)]; struct l_sigframe * sfp; char sfp_r_[PADR_(struct l_sigframe *)];
diff --git a/sys/i386/linux/linux_systrace_args.c b/sys/i386/linux/linux_systrace_args.c
index 4de40b2dbe8ce..0847e751b5ba7 100644
--- a/sys/i386/linux/linux_systrace_args.c
+++ b/sys/i386/linux/linux_systrace_args.c
@@ -814,9 +814,9 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
 		iarg[0] = p->what; /* l_uint */
 		iarg[1] = p->arg1; /* l_int */
 		iarg[2] = p->arg2; /* l_int */
-		iarg[3] = p->arg3; /* l_int */
-		uarg[4] = (intptr_t) p->ptr; /* void * */
-		iarg[5] = p->arg5; /* l_long */
+		iarg[3] = p->arg3; /* l_uint */
+		iarg[4] = p->ptr; /* l_uintptr_t */
+		iarg[5] = p->arg5; /* l_uint */
 		*n_args = 6;
 		break;
 	}
@@ -4012,13 +4012,13 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
 			p = "l_int";
 			break;
 		case 3:
-			p = "l_int";
+			p = "l_uint";
 			break;
 		case 4:
-			p = "userland void *";
+			p = "l_uintptr_t";
 			break;
 		case 5:
-			p = "l_long";
+			p = "l_uint";
 			break;
 		default:
 			break;