From nobody Tue Jul 12 17:32:33 2022 X-Original-To: dev-commits-src-branches@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 A5F111CF8FE1; Tue, 12 Jul 2022 17:32: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Lj79s3lbdz3bPQ; Tue, 12 Jul 2022 17:32:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657647153; 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=2d7BGsb8m5qu6uQtJQMkhmM/0Du01a0ZWutA3y2cA5A=; b=B4JgsGJhXTBdq8qdRAirMDBko6sFRNLMyEaLvdautYhkSGoXtBmU7CddvGL7zxAcr0hTIg 9j2cUiq52/GulsF2vcchKaGopHB0uXWNjIJniE8CwAoqVA6qHeIKt9OdilAOc+hPyMN9Hn FVIkiPTA1XI58uqKX5y3W+C7nUraB2b4XU5UpsyJKlcA9SqlV6QDBbGC4Yv8+vzf7RnFmY SOE+hgnYOoqGFu1UrIYufAt77g8hwChS6+eGheryZfzeyIMkW6VJLl/wZOCV4I38MZzfU8 eM0ScoEke037WcFVW6oJImtJOw5vT22S6DfaKOYWe4//3uhWK10da7dPhy5evA== 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 4Lj79s2p4Czsdq; Tue, 12 Jul 2022 17:32:33 +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 26CHWXRQ065544; Tue, 12 Jul 2022 17:32:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26CHWXdx065543; Tue, 12 Jul 2022 17:32:33 GMT (envelope-from git) Date: Tue, 12 Jul 2022 17:32:33 GMT Message-Id: <202207121732.26CHWXdx065543@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Doug Moore Subject: git: 3af858bd8f78 - stable/13 - riscv-busdma: Balance parens. Reported by: jenkins Fixes: c606ab59e7f9 vm_extern: use standard address checkers everywhere List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 3af858bd8f78560630427451c9e14b085d46dff2 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657647153; 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=2d7BGsb8m5qu6uQtJQMkhmM/0Du01a0ZWutA3y2cA5A=; b=LmbGoTMD3WXV5pRFMDwHHbpsyQamj+mzwgdTs742TasLHB3KLx2TqVO2Xn7ARUXLx8rOG6 GRM6BvTIzrKP8KTNxG15QEv7w6TMGSxv9625mkiYCIT8BYAayaIrXUbHmJ6t0ejYEbcn5l OriVE941ZuCFB60eo6zbYfdU69mR4NghKaQgUiLaNrGnv1fAlAfgLpGqNBp9bgesDqhp2n RzVmWab/4/35JE8pYM8yfvDqLkbuE4xGtP4g2CwsxqqTKrbPFTbFJHNfsKPN2Ss7KxgQz7 79JqJsbAWMOE4Qh6G7NYJA0VXG2HAz4jWCU40L3Y0cGHQN9gQH5eoIcJzceyzQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1657647153; a=rsa-sha256; cv=none; b=niriCbFrv81nQAY+3o/qg+TRE3IXuTMvKRpB61tZRdHdMLLSjSloqtdYfzsR/BK7y/yCdy /bT6MX7EtiNJi28BQSWkGK8LdGFSaZBoL0Mw1+C5q1jEoQyu5UuBjhaDaNu4mGdJ4Wn00R yy2v6nt8YvV84vK7fsPBGLG8a76CNoVRul686C1g0afr6OIwn7MBa4q7TN4FP5gGttziod C1bzBwjSTk6ompB+D+r+Gu4UlZOqvbqihPBmNA23zdgLm09aE2XooTXFhBUn5vc+Y4mLvM +c/E5td3omWtt8hjejvnQOtyHpG04w8HRNkvQa/gYAwdSUaDNszfnhXXqba6Ww== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dougm: URL: https://cgit.FreeBSD.org/src/commit/?id=3af858bd8f78560630427451c9e14b085d46dff2 commit 3af858bd8f78560630427451c9e14b085d46dff2 Author: Doug Moore AuthorDate: 2021-12-31 07:59:53 +0000 Commit: Doug Moore CommitDate: 2022-07-12 16:26:08 +0000 riscv-busdma: Balance parens. Reported by: jenkins Fixes: c606ab59e7f9 vm_extern: use standard address checkers everywhere (cherry picked from commit b4961268860857e7343f6e7342d34f6a621546d5) --- 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;