Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 23 Jun 2023 16:41:46 GMT
From:      John Baldwin <jhb@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org
Subject:   git: c3e58ace3145 - main - arm64 iommu: Fix build without INVARIANTS.
Message-ID:  <202306231641.35NGfkGf098429@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by jhb:

URL: https://cgit.FreeBSD.org/src/commit/?id=c3e58ace314561fd382fe27e567c9181ccc836d9

commit c3e58ace314561fd382fe27e567c9181ccc836d9
Author:     John Baldwin <jhb@FreeBSD.org>
AuthorDate: 2023-06-23 16:33:41 +0000
Commit:     John Baldwin <jhb@FreeBSD.org>
CommitDate: 2023-06-23 16:41:26 +0000

    arm64 iommu: Fix build without INVARIANTS.
    
    Obtained from:  CheriBSD
    Sponsored by:   DARPA
---
 sys/arm64/iommu/iommu_pmap.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sys/arm64/iommu/iommu_pmap.c b/sys/arm64/iommu/iommu_pmap.c
index 1c45579835c7..8c4379bcdade 100644
--- a/sys/arm64/iommu/iommu_pmap.c
+++ b/sys/arm64/iommu/iommu_pmap.c
@@ -414,7 +414,9 @@ smmu_pmap_pinit(struct smmu_pmap *pmap)
 	pmap->sp_l0_paddr = VM_PAGE_TO_PHYS(m);
 	pmap->sp_l0 = (pd_entry_t *)PHYS_TO_DMAP(pmap->sp_l0_paddr);
 
+#ifdef INVARIANTS
 	pmap->sp_resident_count = 0;
+#endif
 	mtx_init(&pmap->sp_mtx, "smmu pmap", NULL, MTX_DEF);
 
 	return (1);



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202306231641.35NGfkGf098429>