Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 15 Jul 2017 15:26:38 +0000 (UTC)
From:      Dmitry Chagin <dchagin@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject:   svn commit: r321014 - stable/10/sys/amd64/linux
Message-ID:  <201707151526.v6FFQcSr012360@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: dchagin
Date: Sat Jul 15 15:26:38 2017
New Revision: 321014
URL: https://svnweb.freebsd.org/changeset/base/321014

Log:
  MFC r293908:
  
  Regen after get_robust_list fix.

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

Modified: stable/10/sys/amd64/linux/linux_proto.h
==============================================================================
--- stable/10/sys/amd64/linux/linux_proto.h	Sat Jul 15 15:21:43 2017	(r321013)
+++ stable/10/sys/amd64/linux/linux_proto.h	Sat Jul 15 15:26:38 2017	(r321014)
@@ -965,7 +965,7 @@ struct linux_set_robust_list_args {
 };
 struct linux_get_robust_list_args {
 	char pid_l_[PADL_(l_int)]; l_int pid; char pid_r_[PADR_(l_int)];
-	char head_l_[PADL_(struct linux_robust_list_head *)]; struct linux_robust_list_head * head; char head_r_[PADR_(struct linux_robust_list_head *)];
+	char head_l_[PADL_(struct linux_robust_list_head **)]; struct linux_robust_list_head ** head; char head_r_[PADR_(struct linux_robust_list_head **)];
 	char len_l_[PADL_(l_size_t *)]; l_size_t * len; char len_r_[PADR_(l_size_t *)];
 };
 struct linux_splice_args {

Modified: stable/10/sys/amd64/linux/linux_systrace_args.c
==============================================================================
--- stable/10/sys/amd64/linux/linux_systrace_args.c	Sat Jul 15 15:21:43 2017	(r321013)
+++ stable/10/sys/amd64/linux/linux_systrace_args.c	Sat Jul 15 15:26:38 2017	(r321014)
@@ -2020,7 +2020,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg
 	case 274: {
 		struct linux_get_robust_list_args *p = params;
 		iarg[0] = p->pid; /* l_int */
-		uarg[1] = (intptr_t) p->head; /* struct linux_robust_list_head * */
+		uarg[1] = (intptr_t) p->head; /* struct linux_robust_list_head ** */
 		uarg[2] = (intptr_t) p->len; /* l_size_t * */
 		*n_args = 3;
 		break;
@@ -5347,7 +5347,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *d
 			p = "l_int";
 			break;
 		case 1:
-			p = "struct linux_robust_list_head *";
+			p = "struct linux_robust_list_head **";
 			break;
 		case 2:
 			p = "l_size_t *";



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