From nobody Thu Aug 01 22:27:33 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 4WZk9d6vZwz5RZX0; Thu, 01 Aug 2024 22:27:33 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WZk9d3hvhz4Ylg; Thu, 1 Aug 2024 22:27:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1722551253; 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=3ydqngpG63ztxmjTNwVg+lga94BEsD1JO2oCrIrBNzo=; b=qymd2hMIzcHtkeUROYiH1EogrQB8lRxe1nPWRkpp8cRaEUk+7/qL5pjzI5rru/BnTprJTi DBpfdhB2V/ANXHocDwSsFyocBLPGkKD7YLq2o/a1z8qjK7mpHho5U1mO0cA75FeMkvmQfk M15TT/CJbsZgV3i1YcF8Dn4yot6gC3r3qJrCoh8eNCrIQr5tEdrSUIaKNrBq8TkB59dqMV yJ1zhwwJNjZ2/l+Xf9cWP05l13q7gQc24y9IMieYqPNYXb+zQfQwUJag2sLANkRLpRQd8s iUWX6R8ymP99q3wjlweyI1du6Q1nXm8qI6XyEOuNBy5EyhwY4vTed5H2mjrP3A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1722551253; a=rsa-sha256; cv=none; b=UFjm7vyPZhXI3v5EF1L6euUJcPLaisvqadwBY1cgdP7YGWHqE+5yCGeJpDva+sWceYQcPm kD7Su5qBgqs4Ztl0Us/dalFSLV/Mn9RuU7bDCYQH+dm9uWrWAbDb04aCpfofYRor285lbZ MNwW64EjPUs1pK49mST3G2rxNd+cxTwy6o9MIV1vWNlZ17WAo76R/caJVPmXJv7ySMVySS CTlK3wZXBHPKrcdTPng7RSUFuOHdEOMRyI+jdHS4Zu0hzwT+pEjZa0BpmXmqYzgf6fOQMu ENLa0LfPWlLumly7rLIYeYJRdnOisVUnzwDcnnxmMSUljhlEVKNRvnIWdub5zw== 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=1722551253; 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=3ydqngpG63ztxmjTNwVg+lga94BEsD1JO2oCrIrBNzo=; b=uDeFTGRnavxl3Om/2nonVfSkPEycJz+dG6abG3fvkr6HJiYVB1G42s1KPn6JO2tmOJEX4j u4LPTXNk0gXAE+8WpldWS8qwzO/JUPgpT807ari9/F+lgsW1f8Fz3hcj77mNtfdPcsIhw4 G4krbKPnHNZg73Pl1DQJdoPmNiqr852cY4iQXZzpmf3oT6l9z1xzIrRu384vhl3bMZJq17 MQGy0bqv98+C+kxUA+kD4+eS81nem11paqbg+WGHWXkLVQsX1C2cG0JiybMNYiEPvx9mjq Hw6Qhk3LJaQ/Y51Jfkfw67akhIYbeu0y29bL7v2/XvMPOLLSjTA/dflOFP3xgg== 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 4WZk9d3KHTz12nm; Thu, 1 Aug 2024 22:27:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 471MRXO5027324; Thu, 1 Aug 2024 22:27:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 471MRXt5027321; Thu, 1 Aug 2024 22:27:33 GMT (envelope-from git) Date: Thu, 1 Aug 2024 22:27:33 GMT Message-Id: <202408012227.471MRXt5027321@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Vladimir Kondratyev Subject: git: 0ce38f6c0c82 - stable/14 - LinuxKPI: lockdep_assert: wrong 'cond' used in WARN_ON MACRO 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: wulf X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 0ce38f6c0c822af3b41d9eb63669acef57dd9af9 Auto-Submitted: auto-generated The branch stable/14 has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=0ce38f6c0c822af3b41d9eb63669acef57dd9af9 commit 0ce38f6c0c822af3b41d9eb63669acef57dd9af9 Author: Alvin Chen AuthorDate: 2024-06-06 20:42:06 +0000 Commit: Vladimir Kondratyev CommitDate: 2024-08-01 21:09:39 +0000 LinuxKPI: lockdep_assert: wrong 'cond' used in WARN_ON MACRO 'cond' in WARN_ON need be bracketed, otherwise it is wrong for multiple conditions. Reviewed by: wulf MFC after: 1 week Differential revision: https://reviews.freebsd.org/D44604 (cherry picked from commit 21f4cf5ccf87fd15d4d71f89d4c3ecab13f26146) --- sys/compat/linuxkpi/common/include/linux/lockdep.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/lockdep.h b/sys/compat/linuxkpi/common/include/linux/lockdep.h index a379e191aad7..5291be79218e 100644 --- a/sys/compat/linuxkpi/common/include/linux/lockdep.h +++ b/sys/compat/linuxkpi/common/include/linux/lockdep.h @@ -50,8 +50,8 @@ struct pin_cookie { #define lockdep_unregister_key(key) do { } while(0) #ifdef INVARIANTS -#define lockdep_assert(cond) do { WARN_ON(!cond); } while (0) -#define lockdep_assert_once(cond) do { WARN_ON_ONCE(!cond); } while (0) +#define lockdep_assert(cond) do { WARN_ON(!(cond)); } while (0) +#define lockdep_assert_once(cond) do { WARN_ON_ONCE(!(cond)); } while (0) #define lockdep_assert_not_held(m) do { \ struct lock_object *__lock = (struct lock_object *)(m); \