From nobody Mon Jan 2 21:14:27 2023 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 4Nm7sc3q48z2lNZQ; Mon, 2 Jan 2023 21:14: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 4Nm7sc1c7nz44hH; Mon, 2 Jan 2023 21:14:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1672694068; 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=26E7Lm6Q2bPpopqABylSN6RKI1t6ZiQFH0dihqB2P90=; b=ez9on9VZXthboGtRigfkJ7FEurAsI/cOqvvLZcwybznt5zrU04zUBPe3/X7L30YkM/CBE8 50KrWj38xIost5clrL7xUibUjioCdZY5S4Xj/ozrLv3CHtCcVhp3q9EyT/IgRSiVumfM1Z +70cFCpufpBVrU6hpps9v4ufuEWGeoc5W59Rdreh3KecsLZJmHYl9f01kSmrxAn/KJbubY zJu7kHrxRJZZ50d1xtPgN5wL0QCplNsNlZNvIOQ5Lyuz0D+4LBtEm7TBhWdWa59zVaObHf Mo/zeZNdw5wIhQKIbcWGVex3lzNluODsV6vCqLZw0xPfn9FuGjtAZOJJHKIX3g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1672694068; 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=26E7Lm6Q2bPpopqABylSN6RKI1t6ZiQFH0dihqB2P90=; b=Hl7iXBuKQ7TGSkEY8s2w+MlsZiSR/uUQl84z+6LIYZVDrEecI74MecknSoggecV2DB7Eug gkEsqMOE3Tg+crKe++yphRoSKMgKjgt6IdnYcSkPCmYCrj3dDOTQbItclaTMXZ7byuoDVl Pk29EAwMOeYxqtGRQaafkZrjYH7YCtfIjISDUghXd23isgeUNbCBLRX4Rj19UyXcsySJCs 4VWfTB0rMfg42szXyKwi77OS9xSwTzNRtQxWEGbxSxwkj/r5mieb5QJdt0TIMKseZaaouG gZJgaEP4K/dRyhprWQwiR4By4GG9jQes5T+rySJjzudX/Or3RgtSISn4j3G5EQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1672694068; a=rsa-sha256; cv=none; b=baRykL4OKRx8laGTVh2b4nnuQc6qfmarj/rUh5FsJrWWFeOYp02xA4Bn2QNqfmFdcDUBF0 BcMsXbgmZpoFuyfaLNXhNZDxObiRZJweTKQgwThfmc6AVUecsjEO3SEJiqASRtkupkrnvW Ze7cmm1opkksRp7KH31+bWw/RDqIpqm6OKcoXC0UdNphf/0OstwuGGacJBzYywqsSskHxW RanFXScihJe56JGMD2A8wj9jRcgEovotPk04V2WYuoSZzg3+jugKh6G6+WEupbZscvZsIi j1Dxe3qsLmk2wHEYrK74UAl7x6fil9UdECIZArXziYT/5WutgLx1BbN8ybXY2Q== 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 4Nm7sc0GyZz1LTW; Mon, 2 Jan 2023 21:14:28 +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 302LERFF044202; Mon, 2 Jan 2023 21:14:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 302LERkA044201; Mon, 2 Jan 2023 21:14:27 GMT (envelope-from git) Date: Mon, 2 Jan 2023 21:14:27 GMT Message-Id: <202301022114.302LERkA044201@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: 17f2b12a3877 - main - linuxkpi: Define `lockdep_assert_none_held_once()` 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: dumbbell X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 17f2b12a3877f460f72123242c068881806388c2 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=17f2b12a3877f460f72123242c068881806388c2 commit 17f2b12a3877f460f72123242c068881806388c2 Author: Jean-Sébastien Pédron AuthorDate: 2022-12-30 09:50:02 +0000 Commit: Jean-Sébastien Pédron CommitDate: 2023-01-02 21:07:31 +0000 linuxkpi: Define `lockdep_assert_none_held_once()` This is defined as a no-op even when INVARIANTS is defined. I admit I don't know how to implement that in FreeBSD and didn't search thoroughly. Reviewed by: bz Approved by: bz Differential Revision: https://reviews.freebsd.org/D37911 --- sys/compat/linuxkpi/common/include/linux/lockdep.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys/compat/linuxkpi/common/include/linux/lockdep.h b/sys/compat/linuxkpi/common/include/linux/lockdep.h index 89e66267f3dc..1f68d6fbc22d 100644 --- a/sys/compat/linuxkpi/common/include/linux/lockdep.h +++ b/sys/compat/linuxkpi/common/include/linux/lockdep.h @@ -67,6 +67,8 @@ struct pin_cookie { LOCK_CLASS(__lock)->lc_assert(__lock, LA_LOCKED | LA_NOTRECURSED); \ } while (0) +#define lockdep_assert_none_held_once() do { } while (0) + static __inline bool lockdep_is_held(void *__m) { @@ -81,6 +83,7 @@ lockdep_is_held(void *__m) #else #define lockdep_assert_not_held(m) do { (void)(m); } while (0) #define lockdep_assert_held(m) do { (void)(m); } while (0) +#define lockdep_assert_none_held_once() do { } while (0) #define lockdep_assert_held_once(m) do { (void)(m); } while (0)