Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 23 Aug 2020 19:42:48 +0000 (UTC)
From:      Edward Tomasz Napierala <trasz@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org
Subject:   svn commit: r364512 - in stable/12/sys: amd64/linux amd64/linux32 arm64/linux i386/linux
Message-ID:  <202008231942.07NJgm5v086211@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: trasz
Date: Sun Aug 23 19:42:48 2020
New Revision: 364512
URL: https://svnweb.freebsd.org/changeset/base/364512

Log:
  MFC r352209 by emaste:
  
  regen linuxulator sysent after r352208
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  stable/12/sys/amd64/linux/linux_proto.h
  stable/12/sys/amd64/linux/linux_systrace_args.c
  stable/12/sys/amd64/linux32/linux32_proto.h
  stable/12/sys/amd64/linux32/linux32_systrace_args.c
  stable/12/sys/arm64/linux/linux_proto.h
  stable/12/sys/arm64/linux/linux_systrace_args.c
  stable/12/sys/i386/linux/linux_proto.h
  stable/12/sys/i386/linux/linux_systrace_args.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/amd64/linux/linux_proto.h
==============================================================================
--- stable/12/sys/amd64/linux/linux_proto.h	Sun Aug 23 19:41:16 2020	(r364511)
+++ stable/12/sys/amd64/linux/linux_proto.h	Sun Aug 23 19:42:48 2020	(r364512)
@@ -1128,9 +1128,9 @@ struct linux_sched_getattr_args {
 	char flags_l_[PADL_(l_uint)]; l_uint flags; char flags_r_[PADR_(l_uint)];
 };
 struct linux_renameat2_args {
-	char oldfd_l_[PADL_(l_int)]; l_int oldfd; char oldfd_r_[PADR_(l_int)];
+	char olddfd_l_[PADL_(l_int)]; l_int olddfd; char olddfd_r_[PADR_(l_int)];
 	char oldname_l_[PADL_(const char *)]; const char * oldname; char oldname_r_[PADR_(const char *)];
-	char newfd_l_[PADL_(l_int)]; l_int newfd; char newfd_r_[PADR_(l_int)];
+	char newdfd_l_[PADL_(l_int)]; l_int newdfd; char newdfd_r_[PADR_(l_int)];
 	char newname_l_[PADL_(const char *)]; const char * newname; char newname_r_[PADR_(const char *)];
 	char flags_l_[PADL_(unsigned int)]; unsigned int flags; char flags_r_[PADR_(unsigned int)];
 };

Modified: stable/12/sys/amd64/linux/linux_systrace_args.c
==============================================================================
--- stable/12/sys/amd64/linux/linux_systrace_args.c	Sun Aug 23 19:41:16 2020	(r364511)
+++ stable/12/sys/amd64/linux/linux_systrace_args.c	Sun Aug 23 19:42:48 2020	(r364512)
@@ -2302,9 +2302,9 @@ systrace_args(int sysnum, void *params, uint64_t *uarg
 	/* linux_renameat2 */
 	case 316: {
 		struct linux_renameat2_args *p = params;
-		iarg[0] = p->oldfd; /* l_int */
+		iarg[0] = p->olddfd; /* l_int */
 		uarg[1] = (intptr_t) p->oldname; /* const char * */
-		iarg[2] = p->newfd; /* l_int */
+		iarg[2] = p->newdfd; /* l_int */
 		uarg[3] = (intptr_t) p->newname; /* const char * */
 		uarg[4] = p->flags; /* unsigned int */
 		*n_args = 5;

Modified: stable/12/sys/amd64/linux32/linux32_proto.h
==============================================================================
--- stable/12/sys/amd64/linux32/linux32_proto.h	Sun Aug 23 19:41:16 2020	(r364511)
+++ stable/12/sys/amd64/linux32/linux32_proto.h	Sun Aug 23 19:42:48 2020	(r364512)
@@ -1213,9 +1213,9 @@ struct linux_sched_getattr_args {
 	char flags_l_[PADL_(l_uint)]; l_uint flags; char flags_r_[PADR_(l_uint)];
 };
 struct linux_renameat2_args {
-	char oldfd_l_[PADL_(l_int)]; l_int oldfd; char oldfd_r_[PADR_(l_int)];
+	char olddfd_l_[PADL_(l_int)]; l_int olddfd; char olddfd_r_[PADR_(l_int)];
 	char oldname_l_[PADL_(const char *)]; const char * oldname; char oldname_r_[PADR_(const char *)];
-	char newfd_l_[PADL_(l_int)]; l_int newfd; char newfd_r_[PADR_(l_int)];
+	char newdfd_l_[PADL_(l_int)]; l_int newdfd; char newdfd_r_[PADR_(l_int)];
 	char newname_l_[PADL_(const char *)]; const char * newname; char newname_r_[PADR_(const char *)];
 	char flags_l_[PADL_(unsigned int)]; unsigned int flags; char flags_r_[PADR_(unsigned int)];
 };

Modified: stable/12/sys/amd64/linux32/linux32_systrace_args.c
==============================================================================
--- stable/12/sys/amd64/linux32/linux32_systrace_args.c	Sun Aug 23 19:41:16 2020	(r364511)
+++ stable/12/sys/amd64/linux32/linux32_systrace_args.c	Sun Aug 23 19:42:48 2020	(r364512)
@@ -2440,9 +2440,9 @@ systrace_args(int sysnum, void *params, uint64_t *uarg
 	/* linux_renameat2 */
 	case 353: {
 		struct linux_renameat2_args *p = params;
-		iarg[0] = p->oldfd; /* l_int */
+		iarg[0] = p->olddfd; /* l_int */
 		uarg[1] = (intptr_t) p->oldname; /* const char * */
-		iarg[2] = p->newfd; /* l_int */
+		iarg[2] = p->newdfd; /* l_int */
 		uarg[3] = (intptr_t) p->newname; /* const char * */
 		uarg[4] = p->flags; /* unsigned int */
 		*n_args = 5;

Modified: stable/12/sys/arm64/linux/linux_proto.h
==============================================================================
--- stable/12/sys/arm64/linux/linux_proto.h	Sun Aug 23 19:41:16 2020	(r364511)
+++ stable/12/sys/arm64/linux/linux_proto.h	Sun Aug 23 19:42:48 2020	(r364512)
@@ -974,9 +974,9 @@ struct linux_sched_getattr_args {
 	char flags_l_[PADL_(l_uint)]; l_uint flags; char flags_r_[PADR_(l_uint)];
 };
 struct linux_renameat2_args {
-	char oldfd_l_[PADL_(l_int)]; l_int oldfd; char oldfd_r_[PADR_(l_int)];
+	char olddfd_l_[PADL_(l_int)]; l_int olddfd; char olddfd_r_[PADR_(l_int)];
 	char oldname_l_[PADL_(const char *)]; const char * oldname; char oldname_r_[PADR_(const char *)];
-	char newfd_l_[PADL_(l_int)]; l_int newfd; char newfd_r_[PADR_(l_int)];
+	char newdfd_l_[PADL_(l_int)]; l_int newdfd; char newdfd_r_[PADR_(l_int)];
 	char newname_l_[PADL_(const char *)]; const char * newname; char newname_r_[PADR_(const char *)];
 	char flags_l_[PADL_(unsigned int)]; unsigned int flags; char flags_r_[PADR_(unsigned int)];
 };

Modified: stable/12/sys/arm64/linux/linux_systrace_args.c
==============================================================================
--- stable/12/sys/arm64/linux/linux_systrace_args.c	Sun Aug 23 19:41:16 2020	(r364511)
+++ stable/12/sys/arm64/linux/linux_systrace_args.c	Sun Aug 23 19:42:48 2020	(r364512)
@@ -1977,9 +1977,9 @@ systrace_args(int sysnum, void *params, uint64_t *uarg
 	/* linux_renameat2 */
 	case 276: {
 		struct linux_renameat2_args *p = params;
-		iarg[0] = p->oldfd; /* l_int */
+		iarg[0] = p->olddfd; /* l_int */
 		uarg[1] = (intptr_t) p->oldname; /* const char * */
-		iarg[2] = p->newfd; /* l_int */
+		iarg[2] = p->newdfd; /* l_int */
 		uarg[3] = (intptr_t) p->newname; /* const char * */
 		uarg[4] = p->flags; /* unsigned int */
 		*n_args = 5;

Modified: stable/12/sys/i386/linux/linux_proto.h
==============================================================================
--- stable/12/sys/i386/linux/linux_proto.h	Sun Aug 23 19:41:16 2020	(r364511)
+++ stable/12/sys/i386/linux/linux_proto.h	Sun Aug 23 19:42:48 2020	(r364512)
@@ -1220,9 +1220,9 @@ struct linux_sched_getattr_args {
 	char flags_l_[PADL_(l_uint)]; l_uint flags; char flags_r_[PADR_(l_uint)];
 };
 struct linux_renameat2_args {
-	char oldfd_l_[PADL_(l_int)]; l_int oldfd; char oldfd_r_[PADR_(l_int)];
+	char olddfd_l_[PADL_(l_int)]; l_int olddfd; char olddfd_r_[PADR_(l_int)];
 	char oldname_l_[PADL_(const char *)]; const char * oldname; char oldname_r_[PADR_(const char *)];
-	char newfd_l_[PADL_(l_int)]; l_int newfd; char newfd_r_[PADR_(l_int)];
+	char newdfd_l_[PADL_(l_int)]; l_int newdfd; char newdfd_r_[PADR_(l_int)];
 	char newname_l_[PADL_(const char *)]; const char * newname; char newname_r_[PADR_(const char *)];
 	char flags_l_[PADL_(unsigned int)]; unsigned int flags; char flags_r_[PADR_(unsigned int)];
 };

Modified: stable/12/sys/i386/linux/linux_systrace_args.c
==============================================================================
--- stable/12/sys/i386/linux/linux_systrace_args.c	Sun Aug 23 19:41:16 2020	(r364511)
+++ stable/12/sys/i386/linux/linux_systrace_args.c	Sun Aug 23 19:42:48 2020	(r364512)
@@ -2505,9 +2505,9 @@ systrace_args(int sysnum, void *params, uint64_t *uarg
 	/* linux_renameat2 */
 	case 353: {
 		struct linux_renameat2_args *p = params;
-		iarg[0] = p->oldfd; /* l_int */
+		iarg[0] = p->olddfd; /* l_int */
 		uarg[1] = (intptr_t) p->oldname; /* const char * */
-		iarg[2] = p->newfd; /* l_int */
+		iarg[2] = p->newdfd; /* l_int */
 		uarg[3] = (intptr_t) p->newname; /* const char * */
 		uarg[4] = p->flags; /* unsigned int */
 		*n_args = 5;



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