svn commit: r356231 - in head/sys: amd64/linux32 i386/linux
Edward Tomasz Napierala
trasz at FreeBSD.org
Tue Dec 31 16:01:39 UTC 2019
Author: trasz
Date: Tue Dec 31 16:01:37 2019
New Revision: 356231
URL: https://svnweb.freebsd.org/changeset/base/356231
Log:
Regen after r356229.
MFC after: 2 weeks
Sponsored by: The FreeBSD Foundation
Modified:
head/sys/amd64/linux32/linux32_proto.h
head/sys/amd64/linux32/linux32_sysent.c
head/sys/amd64/linux32/linux32_systrace_args.c
head/sys/i386/linux/linux_proto.h
head/sys/i386/linux/linux_sysent.c
head/sys/i386/linux/linux_systrace_args.c
Modified: head/sys/amd64/linux32/linux32_proto.h
==============================================================================
--- head/sys/amd64/linux32/linux32_proto.h Tue Dec 31 16:01:36 2019 (r356230)
+++ head/sys/amd64/linux32/linux32_proto.h Tue Dec 31 16:01:37 2019 (r356231)
@@ -1035,7 +1035,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/amd64/linux32/linux32_sysent.c
==============================================================================
--- head/sys/amd64/linux32/linux32_sysent.c Tue Dec 31 16:01:36 2019 (r356230)
+++ head/sys/amd64/linux32/linux32_sysent.c Tue Dec 31 16:01:37 2019 (r356231)
@@ -335,7 +335,7 @@ struct sysent linux32_sysent[] = {
{ 0, (sy_call_t *)linux_tee, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 315 = linux_tee */
{ 0, (sy_call_t *)linux_vmsplice, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 316 = linux_vmsplice */
{ 0, (sy_call_t *)linux_move_pages, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 317 = linux_move_pages */
- { 0, (sy_call_t *)linux_getcpu, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 318 = linux_getcpu */
+ { AS(linux_getcpu_args), (sy_call_t *)linux_getcpu, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 318 = linux_getcpu */
{ AS(linux_epoll_pwait_args), (sy_call_t *)linux_epoll_pwait, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 319 = linux_epoll_pwait */
{ AS(linux_utimensat_args), (sy_call_t *)linux_utimensat, AUE_FUTIMESAT, NULL, 0, 0, 0, SY_THR_STATIC }, /* 320 = linux_utimensat */
{ 0, (sy_call_t *)linux_signalfd, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 321 = linux_signalfd */
Modified: head/sys/amd64/linux32/linux32_systrace_args.c
==============================================================================
--- head/sys/amd64/linux32/linux32_systrace_args.c Tue Dec 31 16:01:36 2019 (r356230)
+++ head/sys/amd64/linux32/linux32_systrace_args.c Tue Dec 31 16:01:37 2019 (r356231)
@@ -2143,7 +2143,11 @@ systrace_args(int sysnum, void *params, uint64_t *uarg
}
/* linux_getcpu */
case 318: {
- *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 */
@@ -6197,6 +6201,19 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *d
break;
/* linux_getcpu */
case 318:
+ 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 319:
@@ -8686,6 +8703,9 @@ systrace_return_setargdesc(int sysnum, int ndx, char *
case 317:
/* linux_getcpu */
case 318:
+ if (ndx == 0 || ndx == 1)
+ p = "int";
+ break;
/* linux_epoll_pwait */
case 319:
if (ndx == 0 || ndx == 1)
Modified: head/sys/i386/linux/linux_proto.h
==============================================================================
--- head/sys/i386/linux/linux_proto.h Tue Dec 31 16:01:36 2019 (r356230)
+++ head/sys/i386/linux/linux_proto.h Tue Dec 31 16:01:37 2019 (r356231)
@@ -1053,7 +1053,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/i386/linux/linux_sysent.c
==============================================================================
--- head/sys/i386/linux/linux_sysent.c Tue Dec 31 16:01:36 2019 (r356230)
+++ head/sys/i386/linux/linux_sysent.c Tue Dec 31 16:01:37 2019 (r356231)
@@ -335,7 +335,7 @@ struct sysent linux_sysent[] = {
{ 0, (sy_call_t *)linux_tee, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 315 = linux_tee */
{ 0, (sy_call_t *)linux_vmsplice, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 316 = linux_vmsplice */
{ 0, (sy_call_t *)linux_move_pages, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 317 = linux_move_pages */
- { 0, (sy_call_t *)linux_getcpu, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 318 = linux_getcpu */
+ { AS(linux_getcpu_args), (sy_call_t *)linux_getcpu, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 318 = linux_getcpu */
{ AS(linux_epoll_pwait_args), (sy_call_t *)linux_epoll_pwait, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 319 = linux_epoll_pwait */
{ AS(linux_utimensat_args), (sy_call_t *)linux_utimensat, AUE_FUTIMESAT, NULL, 0, 0, 0, SY_THR_STATIC }, /* 320 = linux_utimensat */
{ 0, (sy_call_t *)linux_signalfd, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 321 = linux_signalfd */
Modified: head/sys/i386/linux/linux_systrace_args.c
==============================================================================
--- head/sys/i386/linux/linux_systrace_args.c Tue Dec 31 16:01:36 2019 (r356230)
+++ head/sys/i386/linux/linux_systrace_args.c Tue Dec 31 16:01:37 2019 (r356231)
@@ -2219,7 +2219,11 @@ systrace_args(int sysnum, void *params, uint64_t *uarg
}
/* linux_getcpu */
case 318: {
- *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 */
@@ -6428,6 +6432,19 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *d
break;
/* linux_getcpu */
case 318:
+ 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 319:
@@ -8964,6 +8981,9 @@ systrace_return_setargdesc(int sysnum, int ndx, char *
case 317:
/* linux_getcpu */
case 318:
+ if (ndx == 0 || ndx == 1)
+ p = "int";
+ break;
/* linux_epoll_pwait */
case 319:
if (ndx == 0 || ndx == 1)
More information about the svn-src-all
mailing list