From nobody Tue Jan 24 08:54:15 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 4P1LPN2CHtz30xDw; Tue, 24 Jan 2023 08:54:16 +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 4P1LPM5Kz9z3hQM; Tue, 24 Jan 2023 08:54:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674550455; 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=JsN9gLoHt0CrsPEh41nnq0Y7/7pJvHce+uqAEBI09nM=; b=UuWg0UPrjfUBeYFwWE2SIMtnLjYb/e87PffBOqjkLfGLO/4tndsdjCn/GuIpsPwrHic9Xl +xh2mkxFGJtzUDHqrGGiMv2hGZQ3r/B5o6YqM/eEJFS/K77cSGuNtl21TZYmDaP5IzDtAL 8Yz7yfADd0+VFEesgrT0dABHyIFISYeDhAoAYu7Ai/nr+uL7eZVcC8+opBd/bLM3cg69KQ iIiPPJmVk5QLEM/aoMKkzxKoVi2x9vV+C8q4VAhC4lfUJ8GtAcvfOdfiGQrpiBcktzpU6w 3YHJfJeqvYUnJ683XAw+x8Bos+kQ1cFbmw5b1+CgTrny+YVeJB0NP8PFpn2vbA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674550455; 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=JsN9gLoHt0CrsPEh41nnq0Y7/7pJvHce+uqAEBI09nM=; b=G7OBj8F7prLGpUHu8PXJCjj4CtJXHNpIukKPZ9vq3+mHH2yxt7J810SA4cVpWIFY6j1KbX Itvw55+kZaVQ/ZrLoJRMdyO8TVKIuUuyLcLUQ9lGJ27HzSNFrO9jZq5TjtW56BTvJlTdDK Qrru3nIwl9WRCq0GbCLbsZiC5hRuWlCw5xWLDJnL1D1pMhJPD0coVGxJV92xvhED6Y+bo0 8qFY6h/YFKSUtCrcOjW/CMJjWp57qhkJSJIUnOIsjc7VCzdt+YE3pVkTLGoIcH02moRKF7 pCFzjxxl2843i6fOpBBwie26RP6p9kZZm9elMbWW1VTwkFRowPKSrrYN2A8q3w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674550455; a=rsa-sha256; cv=none; b=d/h+k1rQ5+yYFLBFTrf+IdhM5saPcWhEuX5pnSSsiIiUdN3hvdNo6IXgZoYsvbXbkv7D7M djQjzIaR95JXT0wVmcJt+d44l8Qi49J65OVe9pPgUz1B7Z6zUt+/jnPP3YkcYFTBbStH3G v4COOK13lkZN1/Qu1zirHzI4JVoj+vuf+zlfyh5oX+hYR1MAk7u5uoaKoS8B1bv2xIIqW4 j6C1PgMbwh1URGxbjNWOvVmTX5r8yi5iU8HfCjLOios+uw8c7NeQZVzGM1QBzUCJhJzUWs CraZv0uS3hzOVUy6LiE630GHqAjvM1RlWEhoQRHv6u0NrQp2LUql/isDlCRGnw== 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 4P1LPM48G6z13Nt; Tue, 24 Jan 2023 08:54:15 +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 30O8sFGF036252; Tue, 24 Jan 2023 08:54:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30O8sFYq036251; Tue, 24 Jan 2023 08:54:15 GMT (envelope-from git) Date: Tue, 24 Jan 2023 08:54:15 GMT Message-Id: <202301240854.30O8sFYq036251@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Emmanuel Vadot Subject: git: 281150a7c0bd - stable/13 - linuxkpi: Define `lockdep_assert_none_held_once()` 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: manu X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 281150a7c0bde92a6853123ac1dfffd089187948 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=281150a7c0bde92a6853123ac1dfffd089187948 commit 281150a7c0bde92a6853123ac1dfffd089187948 Author: Jean-Sébastien Pédron AuthorDate: 2022-12-30 09:50:02 +0000 Commit: Emmanuel Vadot CommitDate: 2023-01-24 09:08:01 +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 (cherry picked from commit 17f2b12a3877f460f72123242c068881806388c2) --- 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 6e375d05d477..f1bec0efeee8 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)