svn commit: r316361 - stable/11/sys/amd64/linux

[Edward Tomasz Napierala]

Author: trasz
Date: Sat Apr  1 16:38:20 2017
New Revision: 316361
URL: https://svnweb.freebsd.org/changeset/base/316361

Log:
  MFC r313770:
  
  Regen after r313769.
  
  Sponsored by:	DARPA, AFRL

Modified:
  stable/11/sys/amd64/linux/linux_proto.h
  stable/11/sys/amd64/linux/linux_systrace_args.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/amd64/linux/linux_proto.h
==============================================================================
--- stable/11/sys/amd64/linux/linux_proto.h	Sat Apr  1 16:35:42 2017	(r316360)
+++ stable/11/sys/amd64/linux/linux_proto.h	Sat Apr  1 16:38:20 2017	(r316361)
@@ -424,8 +424,8 @@ struct linux_times_args {
 struct linux_ptrace_args {
 	char req_l_[PADL_(l_long)]; l_long req; char req_r_[PADR_(l_long)];
 	char pid_l_[PADL_(l_long)]; l_long pid; char pid_r_[PADR_(l_long)];
-	char addr_l_[PADL_(l_long)]; l_long addr; char addr_r_[PADR_(l_long)];
-	char data_l_[PADL_(l_long)]; l_long data; char data_r_[PADR_(l_long)];
+	char addr_l_[PADL_(l_ulong)]; l_ulong addr; char addr_r_[PADR_(l_ulong)];
+	char data_l_[PADL_(l_ulong)]; l_ulong data; char data_r_[PADR_(l_ulong)];
 };
 struct linux_getuid_args {
 	register_t dummy;

Modified: stable/11/sys/amd64/linux/linux_systrace_args.c
==============================================================================
--- stable/11/sys/amd64/linux/linux_systrace_args.c	Sat Apr  1 16:35:42 2017	(r316360)
+++ stable/11/sys/amd64/linux/linux_systrace_args.c	Sat Apr  1 16:38:20 2017	(r316361)
@@ -874,8 +874,8 @@ systrace_args(int sysnum, void *params, 
 		struct linux_ptrace_args *p = params;
 		iarg[0] = p->req; /* l_long */
 		iarg[1] = p->pid; /* l_long */
-		iarg[2] = p->addr; /* l_long */
-		iarg[3] = p->data; /* l_long */
+		iarg[2] = p->addr; /* l_ulong */
+		iarg[3] = p->data; /* l_ulong */
 		*n_args = 4;
 		break;
 	}
@@ -3983,10 +3983,10 @@ systrace_entry_setargdesc(int sysnum, in
 			p = "l_long";
 			break;
 		case 2:
-			p = "l_long";
+			p = "l_ulong";
 			break;
 		case 3:
-			p = "l_long";
+			p = "l_ulong";
 			break;
 		default:
 			break;