git: 151ddfec6f82 - main - freebsd32: add _'s to _umtx_(un)lock

The branch main has been updated by brooks:

URL: https://cgit.FreeBSD.org/src/commit/?id=151ddfec6f8211b1c9614be8a183606849a5c3a6

commit 151ddfec6f8211b1c9614be8a183606849a5c3a6
Author:     Brooks Davis <brooks@FreeBSD.org>
AuthorDate: 2021-11-22 22:36:55 +0000
Commit:     Brooks Davis <brooks@FreeBSD.org>
CommitDate: 2021-11-22 22:36:55 +0000

    freebsd32: add _'s to _umtx_(un)lock
    
    This aligns with the default ABI's configuration.
    
    Reviewed by:    kib
---
 sys/compat/freebsd32/syscalls.master | 4 ++--
 sys/kern/kern_umtx.c                 | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/sys/compat/freebsd32/syscalls.master b/sys/compat/freebsd32/syscalls.master
index 839372f5cdcd..2e11fdb03a17 100644
--- a/sys/compat/freebsd32/syscalls.master
+++ b/sys/compat/freebsd32/syscalls.master
@@ -811,9 +811,9 @@
 431	AUE_THR_EXIT	NOPROTO	{ void thr_exit(int32_t *state); }
 432	AUE_NULL	NOPROTO	{ int thr_self(int32_t *id); }
 433	AUE_THR_KILL	NOPROTO	{ int thr_kill(int32_t id, int sig); }
-434	AUE_NULL	COMPAT10 { int freebsd32_umtx_lock( \
+434	AUE_NULL	COMPAT10 { int freebsd32__umtx_lock( \
 				    struct umtx *umtx); }
-435	AUE_NULL	COMPAT10 { int freebsd32_umtx_unlock( \
+435	AUE_NULL	COMPAT10 { int freebsd32__umtx_unlock( \
 				    struct umtx *umtx); }
 436	AUE_JAIL_ATTACH	NOPROTO	{ int jail_attach(int jid); }
 437	AUE_EXTATTR_LIST_FD	NOPROTO	{ ssize_t extattr_list_fd(int fd, \
diff --git a/sys/kern/kern_umtx.c b/sys/kern/kern_umtx.c
index 5e3ab095facc..97673ed77e11 100644
--- a/sys/kern/kern_umtx.c
+++ b/sys/kern/kern_umtx.c
@@ -4856,15 +4856,15 @@ sys__umtx_op(struct thread *td, struct _umtx_op_args *uap)
 #ifdef COMPAT_FREEBSD32
 #ifdef COMPAT_FREEBSD10
 int
-freebsd10_freebsd32_umtx_lock(struct thread *td,
-    struct freebsd10_freebsd32_umtx_lock_args *uap)
+freebsd10_freebsd32__umtx_lock(struct thread *td,
+    struct freebsd10_freebsd32__umtx_lock_args *uap)
 {
 	return (do_lock_umtx32(td, (uint32_t *)uap->umtx, td->td_tid, NULL));
 }
 
 int
-freebsd10_freebsd32_umtx_unlock(struct thread *td,
-    struct freebsd10_freebsd32_umtx_unlock_args *uap)
+freebsd10_freebsd32__umtx_unlock(struct thread *td,
+    struct freebsd10_freebsd32__umtx_unlock_args *uap)
 {
 	return (do_unlock_umtx32(td, (uint32_t *)uap->umtx, td->td_tid));
 }