git: 92b1cf857241 - stable/13 - linux(4): Regen for futex system call.
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 17 Jun 2022 19:31:47 UTC
The branch stable/13 has been updated by dchagin:
URL: https://cgit.FreeBSD.org/src/commit/?id=92b1cf857241d48691a4c09e7b58802257ea2b6d
commit 92b1cf857241d48691a4c09e7b58802257ea2b6d
Author: Dmitry Chagin <dchagin@FreeBSD.org>
AuthorDate: 2021-06-10 11:16:40 +0000
Commit: Dmitry Chagin <dchagin@FreeBSD.org>
CommitDate: 2022-06-17 19:30:14 +0000
linux(4): Regen for futex system call.
MFC after: 2 weeks
(cherry picked from commit ee64d982049544b1e8a77acc01fd230c906fb305)
---
sys/amd64/linux/linux_proto.h | 8 ++++----
sys/amd64/linux/linux_systrace_args.c | 16 ++++++++--------
sys/amd64/linux32/linux32_proto.h | 4 ++--
sys/amd64/linux32/linux32_systrace_args.c | 8 ++++----
sys/arm/linux/linux_proto.h | 4 ++--
sys/arm/linux/linux_systrace_args.c | 8 ++++----
sys/arm64/linux/linux_proto.h | 10 +++++-----
sys/arm64/linux/linux_systrace_args.c | 20 ++++++++++----------
sys/i386/linux/linux_proto.h | 4 ++--
sys/i386/linux/linux_systrace_args.c | 8 ++++----
10 files changed, 45 insertions(+), 45 deletions(-)
diff --git a/sys/amd64/linux/linux_proto.h b/sys/amd64/linux/linux_proto.h
index 60e880d891e8..cfd2f0cf2ca7 100644
--- a/sys/amd64/linux/linux_proto.h
+++ b/sys/amd64/linux/linux_proto.h
@@ -706,12 +706,12 @@ struct linux_time_args {
char tm_l_[PADL_(l_time_t *)]; l_time_t * tm; char tm_r_[PADR_(l_time_t *)];
};
struct linux_sys_futex_args {
- char uaddr_l_[PADL_(void *)]; void * uaddr; char uaddr_r_[PADR_(void *)];
+ char uaddr_l_[PADL_(uint32_t *)]; uint32_t * uaddr; char uaddr_r_[PADR_(uint32_t *)];
char op_l_[PADL_(l_int)]; l_int op; char op_r_[PADR_(l_int)];
- char val_l_[PADL_(l_int)]; l_int val; char val_r_[PADR_(l_int)];
+ char val_l_[PADL_(uint32_t)]; uint32_t val; char val_r_[PADR_(uint32_t)];
char timeout_l_[PADL_(struct l_timespec *)]; struct l_timespec * timeout; char timeout_r_[PADR_(struct l_timespec *)];
- char uaddr2_l_[PADL_(void *)]; void * uaddr2; char uaddr2_r_[PADR_(void *)];
- char val3_l_[PADL_(l_int)]; l_int val3; char val3_r_[PADR_(l_int)];
+ char uaddr2_l_[PADL_(uint32_t *)]; uint32_t * uaddr2; char uaddr2_r_[PADR_(uint32_t *)];
+ char val3_l_[PADL_(uint32_t)]; uint32_t val3; char val3_r_[PADR_(uint32_t)];
};
struct linux_sched_setaffinity_args {
char pid_l_[PADL_(l_pid_t)]; l_pid_t pid; char pid_r_[PADR_(l_pid_t)];
diff --git a/sys/amd64/linux/linux_systrace_args.c b/sys/amd64/linux/linux_systrace_args.c
index d1f2f30f60e0..a4c861b789fd 100644
--- a/sys/amd64/linux/linux_systrace_args.c
+++ b/sys/amd64/linux/linux_systrace_args.c
@@ -1563,12 +1563,12 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
/* linux_sys_futex */
case 202: {
struct linux_sys_futex_args *p = params;
- uarg[0] = (intptr_t)p->uaddr; /* void * */
+ uarg[0] = (intptr_t)p->uaddr; /* uint32_t * */
iarg[1] = p->op; /* l_int */
- iarg[2] = p->val; /* l_int */
+ uarg[2] = p->val; /* uint32_t */
uarg[3] = (intptr_t)p->timeout; /* struct l_timespec * */
- uarg[4] = (intptr_t)p->uaddr2; /* void * */
- iarg[5] = p->val3; /* l_int */
+ uarg[4] = (intptr_t)p->uaddr2; /* uint32_t * */
+ uarg[5] = p->val3; /* uint32_t */
*n_args = 6;
break;
}
@@ -5237,22 +5237,22 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
case 202:
switch (ndx) {
case 0:
- p = "userland void *";
+ p = "userland uint32_t *";
break;
case 1:
p = "l_int";
break;
case 2:
- p = "l_int";
+ p = "uint32_t";
break;
case 3:
p = "userland struct l_timespec *";
break;
case 4:
- p = "userland void *";
+ p = "userland uint32_t *";
break;
case 5:
- p = "l_int";
+ p = "uint32_t";
break;
default:
break;
diff --git a/sys/amd64/linux32/linux32_proto.h b/sys/amd64/linux32/linux32_proto.h
index d8ac24f8492b..aa48b0b50b89 100644
--- a/sys/amd64/linux32/linux32_proto.h
+++ b/sys/amd64/linux32/linux32_proto.h
@@ -782,8 +782,8 @@ struct linux_sendfile64_args {
char count_l_[PADL_(l_size_t)]; l_size_t count; char count_r_[PADR_(l_size_t)];
};
struct linux_sys_futex_args {
- char uaddr_l_[PADL_(void *)]; void * uaddr; char uaddr_r_[PADR_(void *)];
- char op_l_[PADL_(int)]; int op; char op_r_[PADR_(int)];
+ char uaddr_l_[PADL_(uint32_t *)]; uint32_t * uaddr; char uaddr_r_[PADR_(uint32_t *)];
+ char op_l_[PADL_(l_int)]; l_int op; char op_r_[PADR_(l_int)];
char val_l_[PADL_(uint32_t)]; uint32_t val; char val_r_[PADR_(uint32_t)];
char timeout_l_[PADL_(struct l_timespec *)]; struct l_timespec * timeout; char timeout_r_[PADR_(struct l_timespec *)];
char uaddr2_l_[PADL_(uint32_t *)]; uint32_t * uaddr2; char uaddr2_r_[PADR_(uint32_t *)];
diff --git a/sys/amd64/linux32/linux32_systrace_args.c b/sys/amd64/linux32/linux32_systrace_args.c
index 9eb9bfc15390..bd6201cf4469 100644
--- a/sys/amd64/linux32/linux32_systrace_args.c
+++ b/sys/amd64/linux32/linux32_systrace_args.c
@@ -1692,8 +1692,8 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
/* linux_sys_futex */
case 240: {
struct linux_sys_futex_args *p = params;
- uarg[0] = (intptr_t)p->uaddr; /* void * */
- iarg[1] = p->op; /* int */
+ uarg[0] = (intptr_t)p->uaddr; /* uint32_t * */
+ iarg[1] = p->op; /* l_int */
uarg[2] = p->val; /* uint32_t */
uarg[3] = (intptr_t)p->timeout; /* struct l_timespec * */
uarg[4] = (intptr_t)p->uaddr2; /* uint32_t * */
@@ -5851,10 +5851,10 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
case 240:
switch (ndx) {
case 0:
- p = "userland void *";
+ p = "userland uint32_t *";
break;
case 1:
- p = "int";
+ p = "l_int";
break;
case 2:
p = "uint32_t";
diff --git a/sys/arm/linux/linux_proto.h b/sys/arm/linux/linux_proto.h
index e458adb30a10..b07dc8290016 100644
--- a/sys/arm/linux/linux_proto.h
+++ b/sys/arm/linux/linux_proto.h
@@ -648,8 +648,8 @@ struct linux_sendfile64_args {
char count_l_[PADL_(l_size_t)]; l_size_t count; char count_r_[PADR_(l_size_t)];
};
struct linux_sys_futex_args {
- char uaddr_l_[PADL_(void *)]; void * uaddr; char uaddr_r_[PADR_(void *)];
- char op_l_[PADL_(int)]; int op; char op_r_[PADR_(int)];
+ char uaddr_l_[PADL_(uint32_t *)]; uint32_t * uaddr; char uaddr_r_[PADR_(uint32_t *)];
+ char op_l_[PADL_(l_int)]; l_int op; char op_r_[PADR_(l_int)];
char val_l_[PADL_(uint32_t)]; uint32_t val; char val_r_[PADR_(uint32_t)];
char timeout_l_[PADL_(struct l_timespec *)]; struct l_timespec * timeout; char timeout_r_[PADR_(struct l_timespec *)];
char uaddr2_l_[PADL_(uint32_t *)]; uint32_t * uaddr2; char uaddr2_r_[PADR_(uint32_t *)];
diff --git a/sys/arm/linux/linux_systrace_args.c b/sys/arm/linux/linux_systrace_args.c
index 608d8c1ed238..87608f6992bf 100644
--- a/sys/arm/linux/linux_systrace_args.c
+++ b/sys/arm/linux/linux_systrace_args.c
@@ -1477,8 +1477,8 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
/* linux_sys_futex */
case 240: {
struct linux_sys_futex_args *p = params;
- uarg[0] = (intptr_t)p->uaddr; /* void * */
- iarg[1] = p->op; /* int */
+ uarg[0] = (intptr_t)p->uaddr; /* uint32_t * */
+ iarg[1] = p->op; /* l_int */
uarg[2] = p->val; /* uint32_t */
uarg[3] = (intptr_t)p->timeout; /* struct l_timespec * */
uarg[4] = (intptr_t)p->uaddr2; /* uint32_t * */
@@ -4741,10 +4741,10 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
case 240:
switch (ndx) {
case 0:
- p = "userland void *";
+ p = "userland uint32_t *";
break;
case 1:
- p = "int";
+ p = "l_int";
break;
case 2:
p = "uint32_t";
diff --git a/sys/arm64/linux/linux_proto.h b/sys/arm64/linux/linux_proto.h
index 59904e0c2fe0..47d4c812364f 100644
--- a/sys/arm64/linux/linux_proto.h
+++ b/sys/arm64/linux/linux_proto.h
@@ -408,12 +408,12 @@ struct linux_unshare_args {
register_t dummy;
};
struct linux_sys_futex_args {
- char uaddr_l_[PADL_(void *)]; void * uaddr; char uaddr_r_[PADR_(void *)];
- char op_l_[PADL_(int)]; int op; char op_r_[PADR_(int)];
- char val_l_[PADL_(int)]; int val; char val_r_[PADR_(int)];
+ char uaddr_l_[PADL_(uint32_t *)]; uint32_t * uaddr; char uaddr_r_[PADR_(uint32_t *)];
+ char op_l_[PADL_(l_int)]; l_int op; char op_r_[PADR_(l_int)];
+ char val_l_[PADL_(uint32_t)]; uint32_t val; char val_r_[PADR_(uint32_t)];
char timeout_l_[PADL_(struct l_timespec *)]; struct l_timespec * timeout; char timeout_r_[PADR_(struct l_timespec *)];
- char uaddr2_l_[PADL_(void *)]; void * uaddr2; char uaddr2_r_[PADR_(void *)];
- char val3_l_[PADL_(int)]; int val3; char val3_r_[PADR_(int)];
+ char uaddr2_l_[PADL_(uint32_t *)]; uint32_t * uaddr2; char uaddr2_r_[PADR_(uint32_t *)];
+ char val3_l_[PADL_(uint32_t)]; uint32_t val3; char val3_r_[PADR_(uint32_t)];
};
struct linux_set_robust_list_args {
char head_l_[PADL_(struct linux_robust_list_head *)]; struct linux_robust_list_head * head; char head_r_[PADR_(struct linux_robust_list_head *)];
diff --git a/sys/arm64/linux/linux_systrace_args.c b/sys/arm64/linux/linux_systrace_args.c
index b8be9e91c823..929b70270045 100644
--- a/sys/arm64/linux/linux_systrace_args.c
+++ b/sys/arm64/linux/linux_systrace_args.c
@@ -772,12 +772,12 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
/* linux_sys_futex */
case 98: {
struct linux_sys_futex_args *p = params;
- uarg[0] = (intptr_t)p->uaddr; /* void * */
- iarg[1] = p->op; /* int */
- iarg[2] = p->val; /* int */
+ uarg[0] = (intptr_t)p->uaddr; /* uint32_t * */
+ iarg[1] = p->op; /* l_int */
+ uarg[2] = p->val; /* uint32_t */
uarg[3] = (intptr_t)p->timeout; /* struct l_timespec * */
- uarg[4] = (intptr_t)p->uaddr2; /* void * */
- iarg[5] = p->val3; /* int */
+ uarg[4] = (intptr_t)p->uaddr2; /* uint32_t * */
+ uarg[5] = p->val3; /* uint32_t */
*n_args = 6;
break;
}
@@ -3633,22 +3633,22 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
case 98:
switch (ndx) {
case 0:
- p = "userland void *";
+ p = "userland uint32_t *";
break;
case 1:
- p = "int";
+ p = "l_int";
break;
case 2:
- p = "int";
+ p = "uint32_t";
break;
case 3:
p = "userland struct l_timespec *";
break;
case 4:
- p = "userland void *";
+ p = "userland uint32_t *";
break;
case 5:
- p = "int";
+ p = "uint32_t";
break;
default:
break;
diff --git a/sys/i386/linux/linux_proto.h b/sys/i386/linux/linux_proto.h
index 1b3512c5b890..a417f7804c3b 100644
--- a/sys/i386/linux/linux_proto.h
+++ b/sys/i386/linux/linux_proto.h
@@ -779,8 +779,8 @@ struct linux_sendfile64_args {
char count_l_[PADL_(l_size_t)]; l_size_t count; char count_r_[PADR_(l_size_t)];
};
struct linux_sys_futex_args {
- char uaddr_l_[PADL_(void *)]; void * uaddr; char uaddr_r_[PADR_(void *)];
- char op_l_[PADL_(int)]; int op; char op_r_[PADR_(int)];
+ char uaddr_l_[PADL_(uint32_t *)]; uint32_t * uaddr; char uaddr_r_[PADR_(uint32_t *)];
+ char op_l_[PADL_(l_int)]; l_int op; char op_r_[PADR_(l_int)];
char val_l_[PADL_(uint32_t)]; uint32_t val; char val_r_[PADR_(uint32_t)];
char timeout_l_[PADL_(struct l_timespec *)]; struct l_timespec * timeout; char timeout_r_[PADR_(struct l_timespec *)];
char uaddr2_l_[PADL_(uint32_t *)]; uint32_t * uaddr2; char uaddr2_r_[PADR_(uint32_t *)];
diff --git a/sys/i386/linux/linux_systrace_args.c b/sys/i386/linux/linux_systrace_args.c
index b8e07e3cc985..37dcd1db59d8 100644
--- a/sys/i386/linux/linux_systrace_args.c
+++ b/sys/i386/linux/linux_systrace_args.c
@@ -1731,8 +1731,8 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
/* linux_sys_futex */
case 240: {
struct linux_sys_futex_args *p = params;
- uarg[0] = (intptr_t)p->uaddr; /* void * */
- iarg[1] = p->op; /* int */
+ uarg[0] = (intptr_t)p->uaddr; /* uint32_t * */
+ iarg[1] = p->op; /* l_int */
uarg[2] = p->val; /* uint32_t */
uarg[3] = (intptr_t)p->timeout; /* struct l_timespec * */
uarg[4] = (intptr_t)p->uaddr2; /* uint32_t * */
@@ -5939,10 +5939,10 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
case 240:
switch (ndx) {
case 0:
- p = "userland void *";
+ p = "userland uint32_t *";
break;
case 1:
- p = "int";
+ p = "l_int";
break;
case 2:
p = "uint32_t";