From nobody Fri Dec 31 08:02:10 2021 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 9CA68192803F; Fri, 31 Dec 2021 08:02:11 +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 4JQHfq1gVZz4rVr; Fri, 31 Dec 2021 08:02:11 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 ED69327BDE; Fri, 31 Dec 2021 08:02:10 +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 1BV82ADC029808; Fri, 31 Dec 2021 08:02:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BV82AEq029807; Fri, 31 Dec 2021 08:02:10 GMT (envelope-from git) Date: Fri, 31 Dec 2021 08:02:10 GMT Message-Id: <202112310802.1BV82AEq029807@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Doug Moore Subject: git: b49612688608 - main - riscv-busdma: Balance parens. Reported by: jenkins Fixes: c606ab59e7f9 vm_extern: use standard address checkers everywhere 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: dougm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b4961268860857e7343f6e7342d34f6a621546d5 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1640937731; 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=DSyz53qykeCAvJl2MB3pMIJocIlNCtxkBAVq4HIjro8=; b=ywaXV0Sy4Di/Fo2bhQWxYEpANQKlUotG9OMyW21GAoaxIGA1gnb6VNJCDXMqeC2Cy8AbTN 1uBtir9KqU0Co0ngFeHrK6kTOIGbJ0rDHSPOFIPLADInkM+EBsUBauCm/G3v58wSl7edK5 Byuny76tuQ56OYbDOe+CdIZYA1p2Us9daIYnvmmFEyypHXX86ujysY/Ji3XC/stDWzD4NC rnFQRMJAAEbONpYEF904A5ApQw/QvIymNYxa3wImTG/96oh9Lrm5iY8neEn3MYWRQJVviD p3nQbThvNanf1bMGDW/FoaK8bszjtzrgF6NVkPHyCMkZ3lw9CasV1KP7VA5B8Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1640937731; a=rsa-sha256; cv=none; b=XPXExqJJ0kt4+renpCZs4HSO22FzLPKJqLRQC+8Geg4YvtQBUbc3/U6wbHW6vmpS3WMQBV d31aJxIniqRCjr+d9b5phDlCqP4EQQIr0LoCl6BvijCAQD9+eBDSCT6KEqaM0Nkyd4C1ri nbGWZ6nQBn1y07Axrw4gDnjIT2YWNMUiVt5Skk+yIFpjlZ/lc3PDAZKxXbwFm29BrXEtVF rTbfX2W9HJISSHMvdsB0EfnB1xT55hSeLsYXc+dR2CIk3n713jF3ZkJ4Dv4JdG5dHe8ILl BGMcpc74DUj/zKpk0kuWkT8Xe/oEHRNMR0237GD7Sfc1NuXKJrcePFVcNgGVWg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dougm: URL: https://cgit.FreeBSD.org/src/commit/?id=b4961268860857e7343f6e7342d34f6a621546d5 commit b4961268860857e7343f6e7342d34f6a621546d5 Author: Doug Moore AuthorDate: 2021-12-31 07:59:53 +0000 Commit: Doug Moore CommitDate: 2021-12-31 08:01:58 +0000 riscv-busdma: Balance parens. Reported by: jenkins Fixes: c606ab59e7f9 vm_extern: use standard address checkers everywhere --- sys/riscv/riscv/busdma_machdep.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/riscv/riscv/busdma_machdep.c b/sys/riscv/riscv/busdma_machdep.c index 8c249e41e5ea..5a80def489e9 100644 --- a/sys/riscv/riscv/busdma_machdep.c +++ b/sys/riscv/riscv/busdma_machdep.c @@ -102,7 +102,7 @@ bus_dma_run_filter(struct bus_dma_tag_common *tc, bus_addr_t paddr) retval = 0; do { if (((paddr > tc->lowaddr && paddr <= tc->highaddr) || - !vm_addr_align_ok(paddr, tc->alignment) && + !vm_addr_align_ok(paddr, tc->alignment)) && (tc->filter == NULL || (*tc->filter)(tc->filterarg, paddr) != 0)) retval = 1;