From nobody Mon Nov 22 22:37:37 2021 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id B4F701892B8C; Mon, 22 Nov 2021 22:37:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Hyhwy6pN3z4XmK; Mon, 22 Nov 2021 22:37:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id DBE4B2E3A; Mon, 22 Nov 2021 22:37:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1AMMbbJM047014; Mon, 22 Nov 2021 22:37:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1AMMbbNG047013; Mon, 22 Nov 2021 22:37:37 GMT (envelope-from git) Date: Mon, 22 Nov 2021 22:37:37 GMT Message-Id: <202111222237.1AMMbbNG047013@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: 151ddfec6f82 - main - freebsd32: add _'s to _umtx_(un)lock List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 151ddfec6f8211b1c9614be8a183606849a5c3a6 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=151ddfec6f8211b1c9614be8a183606849a5c3a6 commit 151ddfec6f8211b1c9614be8a183606849a5c3a6 Author: Brooks Davis AuthorDate: 2021-11-22 22:36:55 +0000 Commit: Brooks Davis 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)); }