From nobody Wed May 11 00:30:07 2022 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 0911C1AE4D0E; Wed, 11 May 2022 00:30:08 +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 4KybQl39rYz4nsN; Wed, 11 May 2022 00:30:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652229007; 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=/YWh4X/T+1cS/garbDsNUKBkAin7JdDt4mrND0Eq/I0=; b=yypxkNDQKitBIKZbiQVIKbXEBra9u1MTStLVyJuw/THNcEFocCYDA6cuv1iMd9zjK8MiFN J690o/Q3G2mBveydsmItruJJqMOVdD9a9EsZg9JaYUzQLYQYp4CHNjUCinDO7c4NmyTfBc /36tFe1zabL0FsUGJHAQ4JdGbMNiDJ5uJMH2fcfHP8gxIafZAbBVjmiXhhcqAEuRi/tbcC BcYM2lw6fQBcpt4HDjg5JDPHvhE9nyaLIQ9gBstxszselO6nAz4U2Y8cmuZy2N2fhwkNwQ BBmYM/ZK6RV/BWqxl7nbq+XmuK3bwkMuaqyNQJeNvz74CU9FT6dILVX/fbZuTg== 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 39CDF7B24; Wed, 11 May 2022 00:30:07 +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 24B0U71m057105; Wed, 11 May 2022 00:30:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24B0U7qt057102; Wed, 11 May 2022 00:30:07 GMT (envelope-from git) Date: Wed, 11 May 2022 00:30:07 GMT Message-Id: <202205110030.24B0U7qt057102@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: f70fe58d0a8d - stable/13 - linuxkpi xarray: Correct expression in assertion. 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: f70fe58d0a8dff309ca477e72dbe07d95f900a35 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652229007; 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=/YWh4X/T+1cS/garbDsNUKBkAin7JdDt4mrND0Eq/I0=; b=A2gp9Yd2CKcCAwTZzOdDi7YI0s9tfmk8z+DoLz9gcqyoGVkWk+EsaDME+hy9wf+fHWosEz hDtMn9wJzuG+wEt2QyCPb56Ss+BsMZCWc9iqmc0ikrJZ9kO7ZOvDBfCSbVS3n4oy13b2KJ 8bsyy3DE4GXPF1RlGtSA/+QYU2C7NFdCw1P+rkJrQJxMjPinawBxH8fR3PDKcbzWRYKE8D /+gAqN+/DeSwAbiqTspZY/klURTY6i22E80gPRIquMVnGQPMp+rVzNBvLt0b47K1sLlE9O xSQvj+GnTFfmQ5UUqrUZyJEZOuQuoIzdwlC2XMffVzp+c4RDrReopFJWb7/cSA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1652229007; a=rsa-sha256; cv=none; b=i1eTMK4nGCNT9zsHiL1En80Azyq68wTfFCJJd6wvr0UnfuubNz6wFfBpmUBbq6i/geauX9 aID84bjaMbG4rtsD+DrnB2VKqN7lAYD7mNZ236pvxAY7KIJ40w3i0tCLXiUlGPs9CgVv06 JpQv+J0TjgVDevv05bQ+duloAEtWfOK3pSI/0ivJWi/FCwuRnXxoAC4OeM3wsg8JU6v/5R PhCV/8LtwHb9LndP2xW6iS76LX/ap9r2I9DOVVS8aJ/NYRlG20gln6SW8RHjHMKNVXARme LcnaLl4oyXuaaWHm5ZjHOibs9JNdD5ReuYKNt3DHUCFGAmYC1nJf0Two+Cwjsw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=f70fe58d0a8dff309ca477e72dbe07d95f900a35 commit f70fe58d0a8dff309ca477e72dbe07d95f900a35 Author: John Baldwin AuthorDate: 2022-02-11 21:59:27 +0000 Commit: John Baldwin CommitDate: 2022-05-11 00:07:41 +0000 linuxkpi xarray: Correct expression in assertion. Reported by: GCC -Wparantheses Reviewed by: wulf, hselasky Differential Revision: https://reviews.freebsd.org/D34197 (cherry picked from commit b0c1600a8c42fc1b2c90714d5fefd3266385225a) --- sys/compat/linuxkpi/common/src/linux_xarray.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/compat/linuxkpi/common/src/linux_xarray.c b/sys/compat/linuxkpi/common/src/linux_xarray.c index c26a2af450e8..a41784103852 100644 --- a/sys/compat/linuxkpi/common/src/linux_xarray.c +++ b/sys/compat/linuxkpi/common/src/linux_xarray.c @@ -103,7 +103,7 @@ __xa_alloc(struct xarray *xa, uint32_t *pindex, void *ptr, uint32_t mask, gfp_t XA_ASSERT_LOCKED(xa); /* mask should allow to allocate at least one item */ - MPASS(mask > (xa->flags & XA_FLAGS_ALLOC1) != 0 ? 1 : 0); + MPASS(mask > ((xa->flags & XA_FLAGS_ALLOC1) != 0 ? 1 : 0)); /* mask can be any power of two value minus one */ MPASS((mask & (mask + 1)) == 0); @@ -160,7 +160,7 @@ __xa_alloc_cyclic(struct xarray *xa, uint32_t *pindex, void *ptr, uint32_t mask, XA_ASSERT_LOCKED(xa); /* mask should allow to allocate at least one item */ - MPASS(mask > (xa->flags & XA_FLAGS_ALLOC1) != 0 ? 1 : 0); + MPASS(mask > ((xa->flags & XA_FLAGS_ALLOC1) != 0 ? 1 : 0)); /* mask can be any power of two value minus one */ MPASS((mask & (mask + 1)) == 0);