Skip site navigation (1)Skip section navigation (2) 
Date:      Thu, 1 May 2014 13:22:18 +0000 (UTC)
From:      Dmitry Chagin <dchagin@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-user@freebsd.org
Subject:   svn commit: r265176 - user/dchagin/lemul/sys/amd64/linux
Message-ID:  <201405011322.s41DMINU056469@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: dchagin
Date: Thu May  1 13:22:18 2014
New Revision: 265176
URL: http://svnweb.freebsd.org/changeset/base/265176

Log:
  Regen for r265175.

Modified:
  user/dchagin/lemul/sys/amd64/linux/linux_proto.h
  user/dchagin/lemul/sys/amd64/linux/linux_systrace_args.c

Modified: user/dchagin/lemul/sys/amd64/linux/linux_proto.h
==============================================================================
--- user/dchagin/lemul/sys/amd64/linux/linux_proto.h	Thu May  1 13:20:54 2014	(r265175)
+++ user/dchagin/lemul/sys/amd64/linux/linux_proto.h	Thu May  1 13:22:18 2014	(r265176)
@@ -15,6 +15,7 @@
 #include <sys/_ffcounter.h>
 #include <sys/_semaphore.h>
 #include <sys/ucontext.h>
+#include <sys/wait.h>
 
 #include <bsm/audit_kevents.h>
 
@@ -558,10 +559,10 @@ struct linux_sysctl_args {
 };
 struct linux_prctl_args {
 	char option_l_[PADL_(l_int)]; l_int option; char option_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 arg4_l_[PADL_(l_int)]; l_int arg4; char arg4_r_[PADR_(l_int)];
-	char arg5_l_[PADL_(l_int)]; l_int arg5; char arg5_r_[PADR_(l_int)];
+	char arg2_l_[PADL_(l_uintptr_t)]; l_uintptr_t arg2; char arg2_r_[PADR_(l_uintptr_t)];
+	char arg3_l_[PADL_(l_uintptr_t)]; l_uintptr_t arg3; char arg3_r_[PADR_(l_uintptr_t)];
+	char arg4_l_[PADL_(l_uintptr_t)]; l_uintptr_t arg4; char arg4_r_[PADR_(l_uintptr_t)];
+	char arg5_l_[PADL_(l_uintptr_t)]; l_uintptr_t arg5; char arg5_r_[PADR_(l_uintptr_t)];
 };
 struct linux_arch_prctl_args {
 	char code_l_[PADL_(l_int)]; l_int code; char code_r_[PADR_(l_int)];

Modified: user/dchagin/lemul/sys/amd64/linux/linux_systrace_args.c
==============================================================================
--- user/dchagin/lemul/sys/amd64/linux/linux_systrace_args.c	Thu May  1 13:20:54 2014	(r265175)
+++ user/dchagin/lemul/sys/amd64/linux/linux_systrace_args.c	Thu May  1 13:22:18 2014	(r265176)
@@ -1277,10 +1277,10 @@ systrace_args(int sysnum, void *params, 
 	case 157: {
 		struct linux_prctl_args *p = params;
 		iarg[0] = p->option; /* l_int */
-		iarg[1] = p->arg2; /* l_int */
-		iarg[2] = p->arg3; /* l_int */
-		iarg[3] = p->arg4; /* l_int */
-		iarg[4] = p->arg5; /* 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 */
 		*n_args = 5;
 		break;
 	}
@@ -4279,16 +4279,16 @@ systrace_entry_setargdesc(int sysnum, in
 			p = "l_int";
 			break;
 		case 1:
-			p = "l_int";
+			p = "l_uintptr_t";
 			break;
 		case 2:
-			p = "l_int";
+			p = "l_uintptr_t";
 			break;
 		case 3:
-			p = "l_int";
+			p = "l_uintptr_t";
 			break;
 		case 4:
-			p = "l_int";
+			p = "l_uintptr_t";
 			break;
 		default:
 			break;

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