Skip site navigation (1)Skip section navigation (2) 
Date:      Tue, 31 Dec 2019 16:07:12 +0000 (UTC)
From:      Edward Tomasz Napierala <trasz@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r356234 - head/sys/arm/linux
Message-ID:  <201912311607.xBVG7CQe046597@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: trasz
Date: Tue Dec 31 16:07:12 2019
New Revision: 356234
URL: https://svnweb.freebsd.org/changeset/base/356234

Log:
  Regen after r356233.
  
  MFC after:	2 weeks
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/sys/arm/linux/linux_proto.h
  head/sys/arm/linux/linux_sysent.c
  head/sys/arm/linux/linux_systrace_args.c

Modified: head/sys/arm/linux/linux_proto.h
==============================================================================
--- head/sys/arm/linux/linux_proto.h	Tue Dec 31 16:05:07 2019	(r356233)
+++ head/sys/arm/linux/linux_proto.h	Tue Dec 31 16:07:12 2019	(r356234)
@@ -1091,7 +1091,9 @@ struct linux_move_pages_args {
 	register_t dummy;
 };
 struct linux_getcpu_args {
-	register_t dummy;
+	char cpu_l_[PADL_(l_uint *)]; l_uint * cpu; char cpu_r_[PADR_(l_uint *)];
+	char node_l_[PADL_(l_uint *)]; l_uint * node; char node_r_[PADR_(l_uint *)];
+	char cache_l_[PADL_(void *)]; void * cache; char cache_r_[PADR_(void *)];
 };
 struct linux_epoll_pwait_args {
 	char epfd_l_[PADL_(l_int)]; l_int epfd; char epfd_r_[PADR_(l_int)];

Modified: head/sys/arm/linux/linux_sysent.c
==============================================================================
--- head/sys/arm/linux/linux_sysent.c	Tue Dec 31 16:05:07 2019	(r356233)
+++ head/sys/arm/linux/linux_sysent.c	Tue Dec 31 16:07:12 2019	(r356234)
@@ -362,7 +362,7 @@ struct sysent linux_sysent[] = {
 	{ 0, (sy_call_t *)linux_tee, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },		/* 342 = linux_tee */
 	{ 0, (sy_call_t *)linux_vmsplice, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 343 = linux_vmsplice */
 	{ 0, (sy_call_t *)linux_move_pages, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 344 = linux_move_pages */
-	{ 0, (sy_call_t *)linux_getcpu, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 345 = linux_getcpu */
+	{ AS(linux_getcpu_args), (sy_call_t *)linux_getcpu, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 345 = linux_getcpu */
 	{ AS(linux_epoll_pwait_args), (sy_call_t *)linux_epoll_pwait, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 346 = linux_epoll_pwait */
 	{ 0, (sy_call_t *)linux_kexec_load, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 347 = linux_kexec_load */
 	{ AS(linux_utimensat_args), (sy_call_t *)linux_utimensat, AUE_FUTIMESAT, NULL, 0, 0, 0, SY_THR_STATIC },	/* 348 = linux_utimensat */

Modified: head/sys/arm/linux/linux_systrace_args.c
==============================================================================
--- head/sys/arm/linux/linux_systrace_args.c	Tue Dec 31 16:05:07 2019	(r356233)
+++ head/sys/arm/linux/linux_systrace_args.c	Tue Dec 31 16:07:12 2019	(r356234)
@@ -2249,7 +2249,11 @@ systrace_args(int sysnum, void *params, uint64_t *uarg
 	}
 	/* linux_getcpu */
 	case 345: {
-		*n_args = 0;
+		struct linux_getcpu_args *p = params;
+		uarg[0] = (intptr_t) p->cpu; /* l_uint * */
+		uarg[1] = (intptr_t) p->node; /* l_uint * */
+		uarg[2] = (intptr_t) p->cache; /* void * */
+		*n_args = 3;
 		break;
 	}
 	/* linux_epoll_pwait */
@@ -6008,6 +6012,19 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *d
 		break;
 	/* linux_getcpu */
 	case 345:
+		switch(ndx) {
+		case 0:
+			p = "userland l_uint *";
+			break;
+		case 1:
+			p = "userland l_uint *";
+			break;
+		case 2:
+			p = "userland void *";
+			break;
+		default:
+			break;
+		};
 		break;
 	/* linux_epoll_pwait */
 	case 346:
@@ -7547,6 +7564,9 @@ systrace_return_setargdesc(int sysnum, int ndx, char *
 	case 344:
 	/* linux_getcpu */
 	case 345:
+		if (ndx == 0 || ndx == 1)
+			p = "int";
+		break;
 	/* linux_epoll_pwait */
 	case 346:
 		if (ndx == 0 || ndx == 1)

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