From nobody Thu Jun 06 20:42:55 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 4VwGVl572Jz5MxHM; Thu, 06 Jun 2024 20:42:55 +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 4VwGVl4GJTz4q4X; Thu, 6 Jun 2024 20:42:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717706575; 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=iXRg4LA7yPeGWFxkOjud6dPnB7VL9F0Ub1eECu9hQ0s=; b=b6cl9MVoaRvT55nJisXRiw4+z4iGyGNGRj1mGx57pHtn+C0SiZc5Fo2HHEAfmmbH38YHQl lvgDS5gQpWCQBr+RTcH789/DJhINi3nPm6neotcqK/nBBZqWvamsBzd/o1O5mh4/go5mij bbeZqsAUswBgtAIpRscOwJzcrd5Yoa0u4bNsvbPFZnKUH6qtsb/rW1CaXBBiT7i71qIH6h pb65pfhH1dTrv1KhSFLL1Oj2OwltHbmCH1j491R6CkyApznPXvcJJrvuwuZJrxIKR05Iu/ l/fJu761wUYtAYYQ/XM0gsloluRbkI1XdDew0FmMFDRbxaj+g8CM5N5izjw9zg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717706575; a=rsa-sha256; cv=none; b=AgOE1WxiIsyynU0TA6wLRO3l5S/XRUilmtzlkHkObj0301pCvu8Jcbo1qaeJRPwjZa70k2 PcuwA5iYr+ewXQ4wR2G0XvABTLPuM1pmS5xdBBmQz4Mq6RTs3SWJuWSvr7zkXotLZt0cj2 8nqtwgf1QcCU6wFm4deGIePfzlx9y65NxeJ8MTy9pzXd67lvfE53G0Y3wdSOMqfU0kp7Km eNH+vMA7U0a/1Lf6pPLwXBT3qPNtnDIGEdIqZqjoKyOwLzfVw+qgoDcIN2WEnLdO3lXpp9 xI8wxOX7F9VRQ9JqRmivnPlYPt3QVE/iEoSpHVfGR1QM4gg9PqEAsQyCC2dmCQ== 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=1717706575; 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=iXRg4LA7yPeGWFxkOjud6dPnB7VL9F0Ub1eECu9hQ0s=; b=fHy0rF3hhHNrZ32kxshxUlkIvUkLpypdBiOgMZ/NBEhqyhwb13B98ZcvZCDLby76vNCN5J SKOMsw138aNfzw1NtobnLMDxuAoSVZEnbjJ6XH2X8VsnozIJglUkvq2LMZfhY4ToricAso WXVvYanF3nRWRiQgNEaaQWvnw1GFSsPHiZplxH5vwcvysWusDTXzHKaN23l9NRtBO2B/n/ LEibdExjSSB/B9cWcD6vX/+1UX/7YniZAOJrqx+YUAO41lya8LRrlZ3OXZmelcE+bZ67dR Fhz0gMa5OSePcqEhKnJWaEA+37XIMG17BxaWTq4pmbDKb8uhmdd98EOi2Vz0Zg== 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 4VwGVl3shNz11fq; Thu, 6 Jun 2024 20:42:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 456KgtFE046065; Thu, 6 Jun 2024 20:42:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 456KgtbE046062; Thu, 6 Jun 2024 20:42:55 GMT (envelope-from git) Date: Thu, 6 Jun 2024 20:42:55 GMT Message-Id: <202406062042.456KgtbE046062@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Vladimir Kondratyev Subject: git: 21f4cf5ccf87 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 21f4cf5ccf87fd15d4d71f89d4c3ecab13f26146 Auto-Submitted: auto-generated The branch main has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=21f4cf5ccf87fd15d4d71f89d4c3ecab13f26146 commit 21f4cf5ccf87fd15d4d71f89d4c3ecab13f26146 Author: Alvin Chen AuthorDate: 2024-06-06 20:42:06 +0000 Commit: Vladimir Kondratyev CommitDate: 2024-06-06 20:42:06 +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 --- 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); \