From nobody Fri Feb 11 22:00:03 2022 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 D81FF19AF738; Fri, 11 Feb 2022 22:00:03 +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 4JwSGC4zF4z3tgv; Fri, 11 Feb 2022 22:00:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644616803; 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=08bR8cbHwLcHZnXGXcst7glTMkPt4Ecez4n32Tifsxk=; b=swo8D044EWgz+Wo0l1GElXZkTH9O94nzgtakcv16HQT2SBlWkSCNqMSLGWiO4LQZSvWris kaqCMDlOmJzPXAlsepvPKICTnv19aMsK1CDUPs+WQrYDmZcZYC50NS++js/8LHEoOpQWJq lMMlOHYtDHcnNzRQUQq0HE9sY/jzbe531XkE6l3Qn0xdVU2ZyVDs8Tr7e+9zSw/oVFlWN6 Qov9HO1cbUFIGkVrkD2X9I5NhUoktByBjKthmmdDXfF8ptSZF5SxSwo5Nb8D0da40fGj28 juPUZWt+ENLpa9M/2tUJb98ZTs4ieXwm/qDcKZl+Ya2I6sqAU1Pl58z1CDl1fQ== 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 81C931B7FA; Fri, 11 Feb 2022 22:00:03 +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 21BM03df037689; Fri, 11 Feb 2022 22:00:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21BM0325037687; Fri, 11 Feb 2022 22:00:03 GMT (envelope-from git) Date: Fri, 11 Feb 2022 22:00:03 GMT Message-Id: <202202112200.21BM0325037687@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: b0c1600a8c42 - main - linuxkpi xarray: Correct expression in assertion. 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b0c1600a8c42fc1b2c90714d5fefd3266385225a Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644616803; 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=08bR8cbHwLcHZnXGXcst7glTMkPt4Ecez4n32Tifsxk=; b=dB7NylcpSlSLYoOGGGQc+OrKiS2Uy1DOCRAGtVsHV950ikd/wIuPn7WcwWPKfazoEzq8xv jddN4pwA1AYspK+eLjTmu9vTD/GkwmU57aBy6oipasnBiF61xjBiMvc3sayqTIF7cJnu90 ex44MXZ7Jv93kr/x9dzSQ9vRBJshtApQOWl38i+Z1PE8WOKWXRbdMhH+fm0QWN6h4anGoc NihqrJ7ahE6tAoX4TPI2H+BXjQUKp0xfIqVjtw1tKuD582q9WHmt1ELJDzkDwS4GDhhnOC AZo2VcpS3cJA8jmHE8s/DzSWhiVVJeY+NoYdsMT0iOKjpMs+Bsp96cBAkH0uMw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644616803; a=rsa-sha256; cv=none; b=jHPXiRswq1JP1mIwXh5ABJp1ZvNDwgSdMVSMGbhHgpYZPZcbIELUmA60iw8v63joZUnpgM CuXh2Qn2P5Gi2p4bkY2WbcL+aIdzUYCZfB19XriyzPqXXqmuHunDTN4ZPutAEleAJxK3bL md5WtT0gyR1kMBMM6/nmeldD1XNL0WHoec47dVNhMNps5HJ5iooJNlL7drPs+HvFX7cuB+ Yj9c9yWYeWThPh5jUH2H1pjUHwdg8iKKFajeJdnCsOPO4cyUdrlRol09+99bOyCvLahXSW 1qENjQmnN7ekcR+q0K9WgGViiq2ZOSikGUpvrfn3bLIS4n/pQDHYM9iBsdQ0Gg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=b0c1600a8c42fc1b2c90714d5fefd3266385225a commit b0c1600a8c42fc1b2c90714d5fefd3266385225a Author: John Baldwin AuthorDate: 2022-02-11 21:59:27 +0000 Commit: John Baldwin CommitDate: 2022-02-11 21:59:27 +0000 linuxkpi xarray: Correct expression in assertion. Reported by: GCC -Wparantheses Reviewed by: wulf, hselasky Differential Revision: https://reviews.freebsd.org/D34197 --- 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);