From nobody Tue Feb 14 22:06:35 2023 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 4PGZzw0L5Wz3q4DJ; Tue, 14 Feb 2023 22:06:36 +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 4PGZzv6lzmz4DnB; Tue, 14 Feb 2023 22:06:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676412396; 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=/CSztGl3XMUZeZA8h9YEF+GLHsSi0jJH284pZ+S4K9c=; b=usflIlWEjOv+d/VK7XDTlguCDTl3ATzMx/83Xsx/LgRuKT7lsrMeTTrRzpTI9iJMzxnxw6 SkQN6cUxh5PFjnMwdrTrxpd8mSgnKuVXedTrNesYvpryd7LtcEMRP5NucUXSY1mw8947CJ xFSikTgTFQMZfIajdKo7y6A6D24skZZW+ph6zJ8OyOWEXTIL7Twch4q0IYP1bs7i9EsQTj isfT8pD/Vtashyczzs1YmSqj3T5/H96fZjasCgMkSFXCphCeeb6BD/hH22lg+SwvFJOcJX Q8GiPwXVXHWRxhecIToOR/tJx8mwIEMLU+9o8CmG9h3Yy7CoaSRF4etQUeS35g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676412396; 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=/CSztGl3XMUZeZA8h9YEF+GLHsSi0jJH284pZ+S4K9c=; b=XDaXgdBOWbuXV6zjmPlfcfM3LvD28cOdOubVQVQhwVLw5pknHJPlMD/a+NkmjBGXu5IBfV 8oA4nBrne9Vk89ECnbigrNAG5t/+RalBbuqmVyBXnYi0RWsyDiDGsYKTtLFOyd05IEBpM8 Bj4067Nli68x5i0Iuu/RszLeWeuwt06tM/hCyhq7uiuGHiw5/SbvrDtCVFE8/kjk58i0Uy EWrt5kRXGzVxcn9mlkNgJC+RXTe68oO69LG4M01YckX4cXUd78m2AfOFJlOe0Y/5XvrE3V NwSSP/YV8OW3Zv+8fUun7ffec/aE2cbRn1gG2BuSoXiLD3V3p1CzAwJuVuN/aw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1676412396; a=rsa-sha256; cv=none; b=tOZez/NBjeD01VqTPGipZJHrKqaTtWpwU21P/HGUCJfwpU0HMoyqYXKQJNZjE/DUnmCCuz 7tjbIZHnL5HVapXo+e0B+hxJTaAMCoH7vlIiGCtxr9Iv6laZmAEAccb4NwuA6YSHHyM1xV aKoMX3hfaKbCbYtS/FeSn+vA9eFL6UjYcOXUC+c65+PSsP9nvP4meDt1que+gnN9geubJe jCgK7Zk/JZT3nKCtMs1zFH3PJcnVoEXD6Lt67LUzch3FjGBMZ72APFMt6gOxVylAsRekeU paoA2j6XhoEXX1ZIEeWoiFhX6fXrclpjXGdro4+SQb03hafbNqsDcKv50TGwrA== 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 4PGZzv5t9fz1FYG; Tue, 14 Feb 2023 22:06:35 +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 31EM6Z4d004146; Tue, 14 Feb 2023 22:06:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31EM6ZLw004145; Tue, 14 Feb 2023 22:06:35 GMT (envelope-from git) Date: Tue, 14 Feb 2023 22:06:35 GMT Message-Id: <202302142206.31EM6ZLw004145@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Jean-S=C3=A9bastien=20P=C3=A9dron?= Subject: git: e6f7fe74a903 - main - linuxkpi: Update `ww_mutex_trylock()` API for Linux 5.16 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: e6f7fe74a903b4085d60b0054ff75ee677beaf76 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dumbbell (ports committer): URL: https://cgit.FreeBSD.org/src/commit/?id=e6f7fe74a903b4085d60b0054ff75ee677beaf76 commit e6f7fe74a903b4085d60b0054ff75ee677beaf76 Author: Jean-Sébastien Pédron AuthorDate: 2023-02-13 22:22:54 +0000 Commit: Jean-Sébastien Pédron CommitDate: 2023-02-14 22:01:07 +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 --- 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)); }