From nobody Mon Jun 24 17:07:25 2024 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 4W7Dsn679sz5PGxp; Mon, 24 Jun 2024 17:07:25 +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 4W7Dsn5flKz4S8B; Mon, 24 Jun 2024 17:07:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719248845; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pa+m3MhNdXLuiwlgQOrFHUezQIk1Co0SllztgDK0Zb4=; b=tiniVtgvrreDuPULJ6yR63VG3iqW3sguid5pbs4I+gcQZPUNFDyS615BkAW9V9cAz5Soix 1pJBXS3+ohFGn1sQWPzQR2poPROMpyuPYkbia5pINROK26xKlNsOSWYREuBphJemZNEtJ3 2DFR5AsTLBe6DJOJB26kajt7wMLQxUGIpxHeo444J31EspK7z14ijaxwh8WkD7vL4pUXqG Ph6dYpPS/zOu05QyV61nh7bjxCIJWWuIU+hARlpQnHrrwg9ChrxLqEYJsHWDK4AlHPMYzf rIU/LFLZxFsPsWHOyV8kCtDjiZR7t8DehqW2EF30yCdM6GljxEVuoKuU89ObJw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719248845; a=rsa-sha256; cv=none; b=jNqPq/w8ng5p+bdT5DsPzcN3YvZSnpgMmt9xjOXtkK3N79q1Ggj1DLLXX49OLdHksXTIub NiLrCe3LMZdbQJTJpD65OJDfiaBN57H4U+m/XUNup2Ud3/paceeryvtD7qU4Uk6LBy1G3X bXk5RmYO5FqvqdjMymA2YhTpLs1OJxjN4iiY+C08kzoKlN5XnZSpR/4DEI2hM8eov2VEkJ E8Y47BLhDQMiFph8YBwfPEhGNYHoud+vAzPNkpEoAeJc5GefAg1J2EzS3LXT1f97Wzr6qI joIQVcYugzprtK+SwCRDBiyJzWUTAQ7AXjQkX6BcQ4iOEtUHszfFAbLBMgk0HA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719248845; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pa+m3MhNdXLuiwlgQOrFHUezQIk1Co0SllztgDK0Zb4=; b=AZtS82J0b21wJE4nN8OY6/iNs0BEF+dzvnAiItb8yt5oqehJ9lMPgtmWqTjKBeEFmLTxKG CnuJ/cKcTMiMHOpc4U8EI+Ap7O4ezZ4D4fYgj6GN7xEjgweBdFhiZgvqtHeoXHd+CeFeFC LXC5VWfmrv/RpK59e+V7KnuRVw25R0tGXdNbkwKa4keGknjgC4j3xBN/DseikkLHXUrLE/ COMW08YKODED65vLIDFl/3Mn8JXo+ovFQ3wrHqKaZd9i29iN6ZEukME+CNZwLmnG/HhNl8 zqx6qJ91NxLVLVd7koHHzVMkKPk+qcOj1nJq63L1xNuBjI2KYlTDNrJciGAkPA== 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 4W7Dsn5GMHzR2w; Mon, 24 Jun 2024 17:07:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 45OH7PbW026428; Mon, 24 Jun 2024 17:07:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45OH7PQY026426; Mon, 24 Jun 2024 17:07:25 GMT (envelope-from git) Date: Mon, 24 Jun 2024 17:07:25 GMT Message-Id: <202406241707.45OH7PQY026426@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ryan Libby Subject: git: 3c84b4b35f28 - main - kern: move __always_inline to canonical position 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rlibby X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3c84b4b35f28ab2d0c3798dd567de05ed020cdca Auto-Submitted: auto-generated The branch main has been updated by rlibby: URL: https://cgit.FreeBSD.org/src/commit/?id=3c84b4b35f28ab2d0c3798dd567de05ed020cdca commit 3c84b4b35f28ab2d0c3798dd567de05ed020cdca Author: Ryan Libby AuthorDate: 2024-06-24 17:05:58 +0000 Commit: Ryan Libby CommitDate: 2024-06-24 17:05:58 +0000 kern: move __always_inline to canonical position Ahead of including inline in __always_inline, move __always_inline to where inline goes. Reviewed by: kib, olce Sponsored by: Dell EMC Isilon Differential Revision: https://reviews.freebsd.org/D45708 --- sys/kern/kern_lock.c | 11 ++++++----- sys/kern/kern_rwlock.c | 6 +++--- sys/kern/kern_sx.c | 6 +++--- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/sys/kern/kern_lock.c b/sys/kern/kern_lock.c index 1b4d21f064a7..4700ee0f8f98 100644 --- a/sys/kern/kern_lock.c +++ b/sys/kern/kern_lock.c @@ -115,7 +115,7 @@ CTASSERT(LK_UNLOCKED == (LK_UNLOCKED & } \ } while (0) -static bool __always_inline +static __always_inline bool LK_CAN_SHARE(uintptr_t x, int flags, bool fp) { @@ -180,9 +180,10 @@ struct lockmgr_wait { int itimo; }; -static bool __always_inline lockmgr_slock_try(struct lock *lk, uintptr_t *xp, +static __always_inline bool lockmgr_slock_try(struct lock *lk, uintptr_t *xp, int flags, bool fp); -static bool __always_inline lockmgr_sunlock_try(struct lock *lk, uintptr_t *xp); +static __always_inline bool lockmgr_sunlock_try(struct lock *lk, + uintptr_t *xp); static void lockmgr_exit(u_int flags, struct lock_object *ilk, int wakeup_swapper) @@ -511,7 +512,7 @@ lockdestroy(struct lock *lk) lock_destroy(&lk->lock_object); } -static bool __always_inline +static __always_inline bool lockmgr_slock_try(struct lock *lk, uintptr_t *xp, int flags, bool fp) { @@ -531,7 +532,7 @@ lockmgr_slock_try(struct lock *lk, uintptr_t *xp, int flags, bool fp) return (false); } -static bool __always_inline +static __always_inline bool lockmgr_sunlock_try(struct lock *lk, uintptr_t *xp) { diff --git a/sys/kern/kern_rwlock.c b/sys/kern/kern_rwlock.c index 29767f09b304..f53c69b5e6ec 100644 --- a/sys/kern/kern_rwlock.c +++ b/sys/kern/kern_rwlock.c @@ -384,7 +384,7 @@ _rw_wunlock_cookie(volatile uintptr_t *c, const char *file, int line) * is unlocked and has no writer waiters or spinners. Failing otherwise * prioritizes writers before readers. */ -static bool __always_inline +static __always_inline bool __rw_can_read(struct thread *td, uintptr_t v, bool fp) { @@ -396,7 +396,7 @@ __rw_can_read(struct thread *td, uintptr_t v, bool fp) return (false); } -static bool __always_inline +static __always_inline bool __rw_rlock_try(struct rwlock *rw, struct thread *td, uintptr_t *vp, bool fp LOCK_FILE_LINE_ARG_DEF) { @@ -742,7 +742,7 @@ __rw_try_rlock(volatile uintptr_t *c, const char *file, int line) return (__rw_try_rlock_int(rw LOCK_FILE_LINE_ARG)); } -static bool __always_inline +static __always_inline bool __rw_runlock_try(struct rwlock *rw, struct thread *td, uintptr_t *vp) { diff --git a/sys/kern/kern_sx.c b/sys/kern/kern_sx.c index d302fa45161e..18e6ba232c4a 100644 --- a/sys/kern/kern_sx.c +++ b/sys/kern/kern_sx.c @@ -984,7 +984,7 @@ _sx_xunlock_hard(struct sx *sx, uintptr_t x LOCK_FILE_LINE_ARG_DEF) kick_proc0(); } -static bool __always_inline +static __always_inline bool __sx_can_read(struct thread *td, uintptr_t x, bool fp) { @@ -996,7 +996,7 @@ __sx_can_read(struct thread *td, uintptr_t x, bool fp) return (false); } -static bool __always_inline +static __always_inline bool __sx_slock_try(struct sx *sx, struct thread *td, uintptr_t *xp, bool fp LOCK_FILE_LINE_ARG_DEF) { @@ -1306,7 +1306,7 @@ _sx_slock(struct sx *sx, int opts, const char *file, int line) return (_sx_slock_int(sx, opts LOCK_FILE_LINE_ARG)); } -static bool __always_inline +static __always_inline bool _sx_sunlock_try(struct sx *sx, struct thread *td, uintptr_t *xp) {