From nobody Fri Jun 23 16:41:46 2023 X-Original-To: dev-commits-src-all@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 4QnjgZ3xf5z4ggbd; Fri, 23 Jun 2023 16:41:46 +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 4QnjgZ3WLXz48vc; Fri, 23 Jun 2023 16:41:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687538506; 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=NKhZrWkaXzln5bJV2yA3ubBYDnnbA+aJt8TVKQUZoPE=; b=gbrwP5xUaIXQsJyS2sC+aC1s9+/t3Bs/HmZsxiZ1EsmgxIO0F7op9TWGU4b5SSz1Fdtptm csU/IrqcUcDsF4aouHiILUq2284lH31dlun+tLitKEFu1O2s4GQq8yhjyfACfgMvHxIHSg cnpntZV+c0HmcI/mq5tfhnRM8a4YIbZ3NWZ5fm4EsMPeA66QLUoUTgIoRxJkbeLGD0bX2g zP2kp20YYdv4lJkxwT0qbP5JeMQa08A9nqLmQam5xwpGcvHC+NBgUmRr60X7M24VUjImZ2 XOBKO6+IoxzeXS+/b+vF4/9oJbPM5ZbVvmD3/idzegtoxdJdOo+JGlg2V3xAbQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687538506; 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=NKhZrWkaXzln5bJV2yA3ubBYDnnbA+aJt8TVKQUZoPE=; b=LsOq3iT3fnonjni7+oEyN4mwZeo60qZJXM0RIOwbgKT9zvEF6ZecOwK8Jz2YgcN/7ojUL4 OxzKBflz5MHgHwqORSe2Tppkxd47WEjqYQlPcL2/J9e8wz7oNAV6XmVu684h0z3YCJOuap J4xx1hQg7Ba5nrNg5jIwSB9SO6hCUWOHBDWozL7gXvLQMCaEzqmPtOkG6Yzg23GdCPW5r6 b4IbAp2TdeTu1FtYHEPCKUPz+kjRMBXAvnNV4/+oav2XLm0mwkeM6gyT/TDHP6qfJMDPWB DbdR110wwYvM6KeAv0u/+1BHDDSQMPU+pgg2oUWimrgNJuQ9RLD4Pk+ohTEaDw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687538506; a=rsa-sha256; cv=none; b=w7giUH6NOtLacVpOBXRXuq3nMTeNMEqt6xsVqK8vxLXR16wAtr16CHbqX35uk+0zRW0/60 cD8R9q4fSP7qUKYhYMCQcAFkh+GbQIhaLHZQUQRB/Lq0tg5LJstRiUxfpTkT0Qh204peq3 3QmblOnNynGU0g8cG6ehuWICbJJFMpWN+xM2JVUJ32PDENEcixqRNDEkBDB9u23VFVZwEQ RqWCv/rqrekQSxF7ZfrYm9sOey9noiB/BQJoIc3HWYqhnQ9d5WKLQdUoh//PLhEv2HqrHk I5awj0sMALfVCaIkSoDSXeYcd5z7yNIHTJzeSf5La+Wp2ma9zC6VnIfLTgtrEA== 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 4QnjgZ2YyPz1BYk; Fri, 23 Jun 2023 16:41:46 +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 35NGfk9v098430; Fri, 23 Jun 2023 16:41:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35NGfkGf098429; Fri, 23 Jun 2023 16:41:46 GMT (envelope-from git) Date: Fri, 23 Jun 2023 16:41:46 GMT Message-Id: <202306231641.35NGfkGf098429@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: c3e58ace3145 - main - arm64 iommu: Fix build without INVARIANTS. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: c3e58ace314561fd382fe27e567c9181ccc836d9 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=c3e58ace314561fd382fe27e567c9181ccc836d9 commit c3e58ace314561fd382fe27e567c9181ccc836d9 Author: John Baldwin AuthorDate: 2023-06-23 16:33:41 +0000 Commit: John Baldwin 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);