From nobody Sat May 7 09:46:18 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 A9B141AC021C; Sat, 7 May 2022 09:46:18 +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 4KwMyL4Ql4z4kfr; Sat, 7 May 2022 09:46:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651916778; 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=/ZQ8TNUUNTHnqAnLeEOm2NSppM4tzu4OLscGdkJjI1k=; b=sEA8+j0MOZXjXHQmvHey9IHh4lAajV1nGa+p2F7gLRhNFe4OVx2bCePY1BpwByZpjih89X MwM2kat3z8V8iJRa7FX3m/dSYcTDInj7qFUU6VXNIDPVPXMIvHWzGGf8WYXDEC1AA9jlQW cYR+IP8Wesx3qFzsVfXsGI51+i9cWrRfyEqIPmjPsIIoyoWUXDAQZTSZyDD9+RiMXvdq3E 6vebeq+7XjvEgo6gZI34uP/rzm3unbtCoDhVFTNKpAlKoukMQTKr3PPXYiQngABK56XEWb ggsTIX4QFJohANpuDqdW+do5C4Gc/U+ezYOGsi3T/Yt21P4SVeUJ0Qn3+F5lxA== 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 780CE6326; Sat, 7 May 2022 09:46:18 +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 2479kIDU015236; Sat, 7 May 2022 09:46:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2479kIx1015235; Sat, 7 May 2022 09:46:18 GMT (envelope-from git) Date: Sat, 7 May 2022 09:46:18 GMT Message-Id: <202205070946.2479kIx1015235@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ruslan Bukin Subject: git: 59446e8ac008 - main - Fix !INVARIANTS build. 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: br X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 59446e8ac0087eb91fd8b7238cbfd10f06a8ed2d Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651916778; 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=/ZQ8TNUUNTHnqAnLeEOm2NSppM4tzu4OLscGdkJjI1k=; b=Kd8SWj71CrYE5g9Ls8rwhc9rbVCWNDaNQVXh9LlnBOcV7Sel/Z2uoAFWdcpHJbPBtHFVZp 6tV8Dwhi7cQh3kC8zb4FKmTwERXWzrEM1L1udoYP3gh+gZtQIT0i6nk5UXVsE7CfXJpF32 x0Jg6a5Vel7Or3qF4gyKL6SLIK484uPNE8U7OSnVCIile5pdaBqSYIUgFV/UcQ5q2OKc2o 9kiVW7jUNS6PUQmx7i09yO0s4RnOwHUaZgcoawIaUW+9a6SifFMXYM2sgtzq9mpZ35R4ao OBbr2OPKLEp+bRhAuUPOTHzHnzVSqiGytk2lqO0YImJs/vKLAqeA/JimLB/g7w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1651916778; a=rsa-sha256; cv=none; b=FgVveX5hFxJ3qojhNgFpTCv+BjFJaufxJ1jMrd/wKFDDmXjC0rxPP8TfNX/zqGUsLSzxzZ 21GvlIslhGU1ndd7X8/LDY9SGoCXU+TjBdTeJUk+vpBqX7GZdbYsNswmWSQ99g2n30Voan IR+dtuRBL682uRqypbj9T21GvDD0yb+Pl+lVhXQ89oYBXKmlvwqhQo0s6IVX0/dtfByEeK 2RwtqZqpom2NNpwGi0+R4JU+EE3vI0F/LyIncIzNA8UCF7CTRwo4nYdYbJnVxboOGekEBU Adw3G79MnUHui0a4Nzp5z9ctPr561P6r1tzttwyzr6CxLDshgeYequ5gtf1g4w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by br: URL: https://cgit.FreeBSD.org/src/commit/?id=59446e8ac0087eb91fd8b7238cbfd10f06a8ed2d commit 59446e8ac0087eb91fd8b7238cbfd10f06a8ed2d Author: Ruslan Bukin AuthorDate: 2022-05-07 09:44:54 +0000 Commit: Ruslan Bukin CommitDate: 2022-05-07 09:45:33 +0000 Fix !INVARIANTS build. Sponsored by: UKRI --- sys/arm64/iommu/iommu.c | 4 +--- sys/arm64/iommu/iommu_pmap.c | 8 +++++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sys/arm64/iommu/iommu.c b/sys/arm64/iommu/iommu.c index e7f51e8693a1..690c11f4777c 100644 --- a/sys/arm64/iommu/iommu.c +++ b/sys/arm64/iommu/iommu.c @@ -299,9 +299,7 @@ iommu_domain_unload(struct iommu_domain *iodom, struct iommu_map_entries_tailq *entries, bool cansleep) { struct iommu_map_entry *entry, *entry1; -#ifdef INVARIANTS - int error; -#endif + int error __unused; TAILQ_FOREACH_SAFE(entry, entries, dmamap_link, entry1) { KASSERT((entry->flags & IOMMU_MAP_ENTRY_MAP) != 0, diff --git a/sys/arm64/iommu/iommu_pmap.c b/sys/arm64/iommu/iommu_pmap.c index 586620ef9ba9..06775efedfe9 100644 --- a/sys/arm64/iommu/iommu_pmap.c +++ b/sys/arm64/iommu/iommu_pmap.c @@ -560,7 +560,7 @@ _pmap_alloc_l3(pmap_t pmap, vm_pindex_t ptepindex) void iommu_pmap_release(pmap_t pmap) { - boolean_t rv; + boolean_t rv __unused; struct spglist free; vm_page_t m; @@ -603,7 +603,8 @@ pmap_gpu_enter(pmap_t pmap, vm_offset_t va, vm_paddr_t pa, vm_prot_t prot, u_int flags) { pd_entry_t *pde; - pt_entry_t new_l3, orig_l3; + pt_entry_t new_l3; + pt_entry_t orig_l3 __unused; pt_entry_t *l3; vm_page_t mpte; pd_entry_t *l1p; @@ -720,7 +721,8 @@ pmap_smmu_enter(pmap_t pmap, vm_offset_t va, vm_paddr_t pa, vm_prot_t prot, u_int flags) { pd_entry_t *pde; - pt_entry_t new_l3, orig_l3; + pt_entry_t new_l3; + pt_entry_t orig_l3 __unused; pt_entry_t *l3; vm_page_t mpte; int lvl;