From nobody Mon Jun 24 17:07:27 2024 X-Original-To: dev-commits-src-all@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 4W7Dsr352Sz5PGxq; Mon, 24 Jun 2024 17:07:28 +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 4W7Dsr0XF4z4S4G; Mon, 24 Jun 2024 17:07:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719248848; 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=4XZIB8nSgWa8qN+n771jpNiLcjEMG++FiKo3dScRqEM=; b=ya1p9TgRDyhR6NIzpuQnAfghIn0H1DgJqXWq2YTI8dEod6nhQ99JIvZzS2YCyCIG8f18rn VBKKk1oVlBsJMpCROLRTs/hIXg5DB+oswG8rNOjxsB9WcGeK971m/mGFVlggezXYAe3A1j rZLC0MIc50QK0Or3OyFBtpTK1K+83j/cf3dJ1ild5rhvdlAVKgUjZcMqYcy6Qt6i5tp+xH nyqdotwle0m6SY9Te2bvhZSprt9l4O+ca7zECsiXh8kCI/ipVLsBxorGZsaiAI/7cIxCWV KNFaejprAR9CaNPV8VVZb1QEv6OETPy562nzuBhq4VGgpk3fmUfXT5u1XwL1gQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719248848; a=rsa-sha256; cv=none; b=D7ukh94WpREaiphgaR/63g+LmRGPikpguDMBD4dh2NS7cP7+sUfcoRfKLM3TuPdI0cSWFd Im6ceuP9PGOetMlJDOTyZvETFUFkvNY4UCN+wAwCCiXPyYye2Elav0MFupJ9h+a58AVE4R YTV2t8p5vp394oo5rgbRVc1ICEcktOrGkou3kcz02rBYSUON0+OApJqOZg6zOu1CgwRF40 rE/kwO6ePrZeEyK+pHtck/uBvhcK6IEMS8tUUrbhnscCq+tTEZWxHe2XZ/+i8S45tgQXxs tCLIiUcEE/v3NuOBR3UnIK9Dtpf6hXGMQ9PosSycXtaIvRnrvPjeASvA53fr2A== 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=1719248848; 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=4XZIB8nSgWa8qN+n771jpNiLcjEMG++FiKo3dScRqEM=; b=Ye/At4neDVttIc5o/Jp1egI/vhaJNlHEsJ5MZfZ/0lCuAM/PLdGVnJ2GhxaMlUT3IWiI7H iwPyyK7oXVTy+StnIcxCa+lkv1Ve4+I+qP/vSWsdcu3VbNpLGYM9b4vRNeNxH9DSzp+dLr XEKiE6hUaNFSFHjbGN1/hPqyf5IGPnm4fyZBmMhE6s5I9MZptW+3RbwKnaC9gHfRBHFB5S 5K3yGK76y6ZXIQtbn82F2VN6p8T387MMpIA7QEuhTX/lzPK27+34f8V0yI8y89gRqO0F7N QGLG86ILtWXGnX4dq/zOuAag6r7u4d2I6A76v1li2XrDB9891PtWqNR/MJG42A== 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 4W7Dsr08QyzR81; Mon, 24 Jun 2024 17:07:28 +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 45OH7RDN026518; Mon, 24 Jun 2024 17:07:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45OH7RFc026515; Mon, 24 Jun 2024 17:07:27 GMT (envelope-from git) Date: Mon, 24 Jun 2024 17:07:27 GMT Message-Id: <202406241707.45OH7RFc026515@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: 012e32c66529 - main - libthr: move __always_inline to canonical position List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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: 012e32c66529ba74a80b7a02da6c983d5a2c2f70 Auto-Submitted: auto-generated The branch main has been updated by rlibby: URL: https://cgit.FreeBSD.org/src/commit/?id=012e32c66529ba74a80b7a02da6c983d5a2c2f70 commit 012e32c66529ba74a80b7a02da6c983d5a2c2f70 Author: Ryan Libby AuthorDate: 2024-06-24 17:05:58 +0000 Commit: Ryan Libby CommitDate: 2024-06-24 17:05:58 +0000 libthr: move __always_inline to canonical position Ahead of including inline in __always_inline, move __always_inline to where inline goes. Reviewed by: imp, kib, olce Sponsored by: Dell EMC Isilon Differential Revision: https://reviews.freebsd.org/D45710 --- lib/libthr/thread/thr_rwlock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libthr/thread/thr_rwlock.c b/lib/libthr/thread/thr_rwlock.c index b482dc8b732a..084181ba922a 100644 --- a/lib/libthr/thread/thr_rwlock.c +++ b/lib/libthr/thread/thr_rwlock.c @@ -59,7 +59,7 @@ __weak_reference(_pthread_rwlock_timedwrlock, pthread_rwlock_timedwrlock); static int init_static(struct pthread *thread, pthread_rwlock_t *rwlock); static int init_rwlock(pthread_rwlock_t *rwlock, pthread_rwlock_t *rwlock_out); -static int __always_inline +static __always_inline int check_and_init_rwlock(pthread_rwlock_t *rwlock, pthread_rwlock_t *rwlock_out) { if (__predict_false(*rwlock == THR_PSHARED_PTR ||