From nobody Thu Feb 16 11:56:37 2023 X-Original-To: dev-commits-src-branches@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 4PHYM95zTdz3q5vb; Thu, 16 Feb 2023 11:56:37 +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 4PHYM94yjCz4CMn; Thu, 16 Feb 2023 11:56:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676548597; 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=RxAvSj1qyfiKvQ5SDNz997gUM7GmFh9NCesSwSMroqk=; b=fF0rkyjN1w51L8snOu6Lj4IeSjoaYrCM1M1BP53hkEidespfr8yLnRsK3aJlvmyS2ERmq1 q0VKdq5zrDDjGPqlYWYZLLocg2ZtQ90SoqSVzYlbdR7n9Zus3jL/PYv8iY+QafRwl7OFJd YHrvKIigOVb5r2BMbvce3b7RsskipNq6Nwh7PGGTPVb4xU9fvNAOHIixEWqUjuWNA7muQu vMHfL/LG3fCbjF58d3gU9+F4mIpQduGvxF2kCz8BcgYTtbwxQ7gKnRrR77PVXDQTh9QDbL HLVu5hDAT0sgKLlXpjy0BnQpHYcWbz9VfCOjU4IE44nrEjThiX/64giF4tdSwQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676548597; 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=RxAvSj1qyfiKvQ5SDNz997gUM7GmFh9NCesSwSMroqk=; b=XhvyGiQgc8bHwlrRIMz+HP0k2Iy61VEuKpJvQnactRuBftOrjXmWZrXhtXiq9tvNr1dbQ3 PRLDbW1Svo1tCD+Tsu3NuBU+y5lOrRFK+2obeW8YRFX+HHURDDu858ZOmCXwgdIHwwBJ1G TAPTNkDh/E+3VZw2XF8sS1eOonjLob+cx+qQ2nuHnzjswV3MwbqFCpbIYmyn9+4ti7D9YF moJvtK9Tu9UBK0S4skF41YUSX69QUvTmouAUKZK0iN8gquG/NsF6Jp8yE3EYRt6TFm9IYu 8TzWxgpQ5ddnGDcZFDrPo0VkUWWFyOOOnm9XVuwp1LxTo4q7VZCJQNkrNsuoVA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1676548597; a=rsa-sha256; cv=none; b=sJ1x/gls5w33FxDes0IKi9FdkcX8HjhrL+6MzP7CRBx+ifnYVGc9kviXUbTOP2e5xU+Tht s6Ts8NrnuWhc1C4PF7Ypo53YOXXyu55Cc7rgMV7V6WYEYY/Jw47Fy8LcCdk8TzMvtPh4Jv oBmjOEztoMKH9tzvhMJwPihQNtoo53dDDUDpa4yUXGiaYBgW20/rX9XccGEEQkAgesEg52 6hoKwEBM+VWjBU+mTl8ji2theVQCwKRtNFZJ81qrHVofBoQP3wefdA/S71VOhLOAsDspg9 Tk3VwL8lizNTmny3ZnkS+Prmu2Ix7FibWqAk7pXPj0Z81BzlQnJAzNbxem9eMA== 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 4PHYM93vqVz13HF; Thu, 16 Feb 2023 11:56: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 31GBub6I056457; Thu, 16 Feb 2023 11:56:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31GBubOl056456; Thu, 16 Feb 2023 11:56:37 GMT (envelope-from git) Date: Thu, 16 Feb 2023 11:56:37 GMT Message-Id: <202302161156.31GBubOl056456@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: =?utf-8?Q?Jean-S=C3=A9bastien=20P=C3=A9dron?= Subject: git: e8a65c48fa1a - stable/13 - linuxkpi: Update `ww_mutex_trylock()` API for Linux 5.16 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dumbbell X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: e8a65c48fa1a8aab8af47bd6144870fc71ae7370 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dumbbell (ports committer): URL: https://cgit.FreeBSD.org/src/commit/?id=e8a65c48fa1a8aab8af47bd6144870fc71ae7370 commit e8a65c48fa1a8aab8af47bd6144870fc71ae7370 Author: Jean-Sébastien Pédron AuthorDate: 2023-02-13 22:22:54 +0000 Commit: Jean-Sébastien Pédron CommitDate: 2023-02-16 11:55:21 +0000 linuxkpi: Update `ww_mutex_trylock()` API for Linux 5.16 It gains new `struct ww_acquire_ctx *` argument we don't use currently. Reviewed by: manu Approved by: manu Differential Revision: https://reviews.freebsd.org/D38568 (cherry picked from commit e6f7fe74a903b4085d60b0054ff75ee677beaf76) --- sys/compat/linuxkpi/common/include/linux/ww_mutex.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sys/compat/linuxkpi/common/include/linux/ww_mutex.h b/sys/compat/linuxkpi/common/include/linux/ww_mutex.h index d0dd7cd52601..651b39a45b15 100644 --- a/sys/compat/linuxkpi/common/include/linux/ww_mutex.h +++ b/sys/compat/linuxkpi/common/include/linux/ww_mutex.h @@ -72,8 +72,13 @@ struct ww_mutex { #define ww_mutex_lock_slow_interruptible(_m, _x) \ ww_mutex_lock_interruptible(_m, _x) +#if defined(LINUXKPI_VERSION) && LINUXKPI_VERSION >= 51600 +static inline int __must_check +ww_mutex_trylock(struct ww_mutex *lock, struct ww_acquire_ctx *ctx __unused) +#else static inline int __must_check ww_mutex_trylock(struct ww_mutex *lock) +#endif { return (mutex_trylock(&lock->base)); }