The branch main has been updated by brooks:
URL:
https://cgit.FreeBSD.org/src/commit/?id=d35a771660adc8dd9966168d9032cda65f24052a
commit d35a771660adc8dd9966168d9032cda65f24052a
Author: Brooks Davis <bro...@freebsd.org>
AuthorDate: 2021-11-17 20:12:24 +0000
Commit: Brooks Davis <bro...@freebsd.org>
CommitDate: 2021-11-17 20:12:24 +0000
freebsd32: sync _umtx_op args with default ABI
Reviewed by: kevans
---
sys/compat/freebsd32/freebsd32_proto.h | 2 +-
sys/compat/freebsd32/freebsd32_systrace_args.c | 2 +-
sys/compat/freebsd32/syscalls.master | 2 +-
sys/kern/kern_umtx.c | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/sys/compat/freebsd32/freebsd32_proto.h
b/sys/compat/freebsd32/freebsd32_proto.h
index 42be42ebc113..a66253b589ca 100644
--- a/sys/compat/freebsd32/freebsd32_proto.h
+++ b/sys/compat/freebsd32/freebsd32_proto.h
@@ -363,7 +363,7 @@ struct freebsd32__umtx_op_args {
char obj_l_[PADL_(void *)]; void * obj; char obj_r_[PADR_(void *)];
char op_l_[PADL_(int)]; int op; char op_r_[PADR_(int)];
char val_l_[PADL_(u_long)]; u_long val; char val_r_[PADR_(u_long)];
- char uaddr_l_[PADL_(void *)]; void * uaddr; char uaddr_r_[PADR_(void
*)];
+ char uaddr1_l_[PADL_(void *)]; void * uaddr1; char uaddr1_r_[PADR_(void
*)];
char uaddr2_l_[PADL_(void *)]; void * uaddr2; char uaddr2_r_[PADR_(void
*)];
};
struct freebsd32_thr_new_args {
diff --git a/sys/compat/freebsd32/freebsd32_systrace_args.c
b/sys/compat/freebsd32/freebsd32_systrace_args.c
index 26829259cd0e..abeaaeb23534 100644
--- a/sys/compat/freebsd32/freebsd32_systrace_args.c
+++ b/sys/compat/freebsd32/freebsd32_systrace_args.c
@@ -2188,7 +2188,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg,
int *n_args)
uarg[0] = (intptr_t)p->obj; /* void * */
iarg[1] = p->op; /* int */
uarg[2] = p->val; /* u_long */
- uarg[3] = (intptr_t)p->uaddr; /* void * */
+ uarg[3] = (intptr_t)p->uaddr1; /* void * */
uarg[4] = (intptr_t)p->uaddr2; /* void * */
*n_args = 5;
break;
diff --git a/sys/compat/freebsd32/syscalls.master
b/sys/compat/freebsd32/syscalls.master
index 23c34350a67d..22e7a376d2be 100644
--- a/sys/compat/freebsd32/syscalls.master
+++ b/sys/compat/freebsd32/syscalls.master
@@ -826,7 +826,7 @@
u_int length); }
453 AUE_AUDITCTL NOPROTO { int auditctl(const char *path); }
454 AUE_NULL STD { int freebsd32__umtx_op(void *obj, int op,\
- u_long val, void *uaddr, \
+ u_long val, void *uaddr1, \
void *uaddr2); }
455 AUE_THR_NEW STD { int freebsd32_thr_new( \
struct thr_param32 *param, \
diff --git a/sys/kern/kern_umtx.c b/sys/kern/kern_umtx.c
index c738cf178866..5e3ab095facc 100644
--- a/sys/kern/kern_umtx.c
+++ b/sys/kern/kern_umtx.c
@@ -4874,7 +4874,7 @@ int
freebsd32__umtx_op(struct thread *td, struct freebsd32__umtx_op_args *uap)
{
- return (kern__umtx_op(td, uap->obj, uap->op, uap->val, uap->uaddr,
+ return (kern__umtx_op(td, uap->obj, uap->op, uap->val, uap->uaddr1,
uap->uaddr2, &umtx_native_ops32));
}
#endif /* COMPAT_FREEBSD32 */
