The branch main has been updated by dchagin:
URL:
https://cgit.FreeBSD.org/src/commit/?id=773d9153c37a709d5c12bc8abe9166e1d044c01b
commit 773d9153c37a709d5c12bc8abe9166e1d044c01b
Author: Dmitry Chagin <dcha...@freebsd.org>
AuthorDate: 2021-06-07 02:21:48 +0000
Commit: Dmitry Chagin <dcha...@freebsd.org>
CommitDate: 2021-06-07 02:21:48 +0000
Regen for ('187715a420237e1ed94dd5aef158eada7dcdc559') Linux
clock_getres_time64 system call.
MFC after: 2 weeks
---
sys/amd64/linux32/linux32_proto.h | 3 ++-
sys/amd64/linux32/linux32_sysent.c | 2 +-
sys/amd64/linux32/linux32_systrace_args.c | 18 +++++++++++++++++-
sys/i386/linux/linux_proto.h | 3 ++-
sys/i386/linux/linux_sysent.c | 2 +-
sys/i386/linux/linux_systrace_args.c | 18 +++++++++++++++++-
6 files changed, 40 insertions(+), 6 deletions(-)
diff --git a/sys/amd64/linux32/linux32_proto.h
b/sys/amd64/linux32/linux32_proto.h
index 18b448d57a8d..7c21877c6214 100644
--- a/sys/amd64/linux32/linux32_proto.h
+++ b/sys/amd64/linux32/linux32_proto.h
@@ -1530,7 +1530,8 @@ struct linux_clock_adjtime64_args {
register_t dummy;
};
struct linux_clock_getres_time64_args {
- register_t dummy;
+ char which_l_[PADL_(clockid_t)]; clockid_t which; char
which_r_[PADR_(clockid_t)];
+ char tp_l_[PADL_(struct l_timespec64 *)]; struct l_timespec64 * tp;
char tp_r_[PADR_(struct l_timespec64 *)];
};
struct linux_clock_nanosleep_time64_args {
register_t dummy;
diff --git a/sys/amd64/linux32/linux32_sysent.c
b/sys/amd64/linux32/linux32_sysent.c
index d33fa28f7a32..7f2a3dfec397 100644
--- a/sys/amd64/linux32/linux32_sysent.c
+++ b/sys/amd64/linux32/linux32_sysent.c
@@ -423,7 +423,7 @@ struct sysent linux32_sysent[] = {
{ .sy_narg = AS(linux_clock_gettime64_args), .sy_call = (sy_call_t
*)linux_clock_gettime64, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt =
SY_THR_STATIC }, /* 403 = linux_clock_gettime64 */
{ .sy_narg = AS(linux_clock_settime64_args), .sy_call = (sy_call_t
*)linux_clock_settime64, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt =
SY_THR_STATIC }, /* 404 = linux_clock_settime64 */
{ .sy_narg = 0, .sy_call = (sy_call_t *)linux_clock_adjtime64,
.sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 405
= linux_clock_adjtime64 */
- { .sy_narg = 0, .sy_call = (sy_call_t *)linux_clock_getres_time64,
.sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 406 =
linux_clock_getres_time64 */
+ { .sy_narg = AS(linux_clock_getres_time64_args), .sy_call = (sy_call_t
*)linux_clock_getres_time64, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt
= SY_THR_STATIC }, /* 406 = linux_clock_getres_time64 */
{ .sy_narg = 0, .sy_call = (sy_call_t *)linux_clock_nanosleep_time64,
.sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /*
407 = linux_clock_nanosleep_time64 */
{ .sy_narg = 0, .sy_call = (sy_call_t *)linux_timer_gettime64,
.sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 408
= linux_timer_gettime64 */
{ .sy_narg = 0, .sy_call = (sy_call_t *)linux_timer_settime64,
.sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 409
= linux_timer_settime64 */
diff --git a/sys/amd64/linux32/linux32_systrace_args.c
b/sys/amd64/linux32/linux32_systrace_args.c
index 6999999399eb..42b963379259 100644
--- a/sys/amd64/linux32/linux32_systrace_args.c
+++ b/sys/amd64/linux32/linux32_systrace_args.c
@@ -2983,7 +2983,10 @@ systrace_args(int sysnum, void *params, uint64_t *uarg,
int *n_args)
}
/* linux_clock_getres_time64 */
case 406: {
- *n_args = 0;
+ struct linux_clock_getres_time64_args *p = params;
+ iarg[0] = p->which; /* clockid_t */
+ uarg[1] = (intptr_t)p->tp; /* struct l_timespec64 * */
+ *n_args = 2;
break;
}
/* linux_clock_nanosleep_time64 */
@@ -8026,6 +8029,16 @@ systrace_entry_setargdesc(int sysnum, int ndx, char
*desc, size_t descsz)
break;
/* linux_clock_getres_time64 */
case 406:
+ switch (ndx) {
+ case 0:
+ p = "clockid_t";
+ break;
+ case 1:
+ p = "userland struct l_timespec64 *";
+ break;
+ default:
+ break;
+ };
break;
/* linux_clock_nanosleep_time64 */
case 407:
@@ -9815,6 +9828,9 @@ systrace_return_setargdesc(int sysnum, int ndx, char
*desc, size_t descsz)
case 405:
/* linux_clock_getres_time64 */
case 406:
+ if (ndx == 0 || ndx == 1)
+ p = "int";
+ break;
/* linux_clock_nanosleep_time64 */
case 407:
/* linux_timer_gettime64 */
diff --git a/sys/i386/linux/linux_proto.h b/sys/i386/linux/linux_proto.h
index 6fc65571cade..b62d91585495 100644
--- a/sys/i386/linux/linux_proto.h
+++ b/sys/i386/linux/linux_proto.h
@@ -1523,7 +1523,8 @@ struct linux_clock_adjtime64_args {
register_t dummy;
};
struct linux_clock_getres_time64_args {
- register_t dummy;
+ char which_l_[PADL_(clockid_t)]; clockid_t which; char
which_r_[PADR_(clockid_t)];
+ char tp_l_[PADL_(struct l_timespec64 *)]; struct l_timespec64 * tp;
char tp_r_[PADR_(struct l_timespec64 *)];
};
struct linux_clock_nanosleep_time64_args {
register_t dummy;
diff --git a/sys/i386/linux/linux_sysent.c b/sys/i386/linux/linux_sysent.c
index 743c541f9277..de0622c464c5 100644
--- a/sys/i386/linux/linux_sysent.c
+++ b/sys/i386/linux/linux_sysent.c
@@ -423,7 +423,7 @@ struct sysent linux_sysent[] = {
{ .sy_narg = AS(linux_clock_gettime64_args), .sy_call = (sy_call_t
*)linux_clock_gettime64, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt =
SY_THR_STATIC }, /* 403 = linux_clock_gettime64 */
{ .sy_narg = AS(linux_clock_settime64_args), .sy_call = (sy_call_t
*)linux_clock_settime64, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt =
SY_THR_STATIC }, /* 404 = linux_clock_settime64 */
{ .sy_narg = 0, .sy_call = (sy_call_t *)linux_clock_adjtime64,
.sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 405
= linux_clock_adjtime64 */
- { .sy_narg = 0, .sy_call = (sy_call_t *)linux_clock_getres_time64,
.sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 406 =
linux_clock_getres_time64 */
+ { .sy_narg = AS(linux_clock_getres_time64_args), .sy_call = (sy_call_t
*)linux_clock_getres_time64, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt
= SY_THR_STATIC }, /* 406 = linux_clock_getres_time64 */
{ .sy_narg = 0, .sy_call = (sy_call_t *)linux_clock_nanosleep_time64,
.sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /*
407 = linux_clock_nanosleep_time64 */
{ .sy_narg = 0, .sy_call = (sy_call_t *)linux_timer_gettime64,
.sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 408
= linux_timer_gettime64 */
{ .sy_narg = 0, .sy_call = (sy_call_t *)linux_timer_settime64,
.sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_STATIC }, /* 409
= linux_timer_settime64 */
diff --git a/sys/i386/linux/linux_systrace_args.c
b/sys/i386/linux/linux_systrace_args.c
index fde853acdeec..304ef643826e 100644
--- a/sys/i386/linux/linux_systrace_args.c
+++ b/sys/i386/linux/linux_systrace_args.c
@@ -3022,7 +3022,10 @@ systrace_args(int sysnum, void *params, uint64_t *uarg,
int *n_args)
}
/* linux_clock_getres_time64 */
case 406: {
- *n_args = 0;
+ struct linux_clock_getres_time64_args *p = params;
+ iarg[0] = p->which; /* clockid_t */
+ uarg[1] = (intptr_t)p->tp; /* struct l_timespec64 * */
+ *n_args = 2;
break;
}
/* linux_clock_nanosleep_time64 */
@@ -8103,6 +8106,16 @@ systrace_entry_setargdesc(int sysnum, int ndx, char
*desc, size_t descsz)
break;
/* linux_clock_getres_time64 */
case 406:
+ switch (ndx) {
+ case 0:
+ p = "clockid_t";
+ break;
+ case 1:
+ p = "userland struct l_timespec64 *";
+ break;
+ default:
+ break;
+ };
break;
/* linux_clock_nanosleep_time64 */
case 407:
@@ -9921,6 +9934,9 @@ systrace_return_setargdesc(int sysnum, int ndx, char
*desc, size_t descsz)
case 405:
/* linux_clock_getres_time64 */
case 406:
+ if (ndx == 0 || ndx == 1)
+ p = "int";
+ break;
/* linux_clock_nanosleep_time64 */
case 407:
/* linux_timer_gettime64 */
_______________________________________________
dev-commits-src-main@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/dev-commits-src-main
To unsubscribe, send any mail to "dev-commits-src-main-unsubscr...@freebsd.org"
