From nobody Sat May 07 20:12:54 2022 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 4B02F1AD8FE7; Sat, 7 May 2022 20:12:57 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (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 "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KwdsP1h98z3LGf; Sat, 7 May 2022 20:12:57 +0000 (UTC) (envelope-from jhb@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651954377; 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: in-reply-to:in-reply-to:references:references; bh=DtBiShKMxFdDCk0upjG8pERrfo11O32gmP9+EeM2CRc=; b=hNJjUqpYlTKRV5xYrWziXEV6lWwto+vgiU9TIdrJb1NXa7GJ2Ee+s0wGzlzxRDnsu6lnIy 1I6JFnb50mn+Gr2LUHcKzY4myErWeL5m3qAM1/Svg59MDIFD/zYEfbUThatm238GMwRqAS X22Eb1zGZND7Lmr0p2y6WXt/xxnxj7WaGJH7IuY1ydofts7c34fgw42ncuxCvLv3zYHb/w 77mxcBKASFPA/7nxCCKgVdXC5rINYIpUCocBeXjBWlz37RdYqU2IqrNHSHp/a4fPtivXYg uegMYBncLu7MMZ9zTFHlagWM9xXIpOBiqVJErqWb6csMHB+O4gD6OkHIL6QDtA== Received: from [IPV6:2601:648:8680:ed60:1979:8828:6ff2:3577] (unknown [IPv6:2601:648:8680:ed60:1979:8828:6ff2:3577]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) (Authenticated sender: jhb) by smtp.freebsd.org (Postfix) with ESMTPSA id 9EDB1EC90; Sat, 7 May 2022 20:12:56 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Message-ID: <0c5690e1-1fcb-a6dd-b827-6ed6006e1166@FreeBSD.org> Date: Sat, 7 May 2022 13:12:54 -0700 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 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:91.0) Gecko/20100101 Thunderbird/91.9.0 Subject: Re: git: 59446e8ac008 - main - Fix !INVARIANTS build. Content-Language: en-US To: Ruslan Bukin , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <202205070946.2479kIx1015235@gitrepo.freebsd.org> From: John Baldwin In-Reply-To: <202205070946.2479kIx1015235@gitrepo.freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651954377; 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: in-reply-to:in-reply-to:references:references; bh=DtBiShKMxFdDCk0upjG8pERrfo11O32gmP9+EeM2CRc=; b=BAbU+hqjcrvzd2KnoggB/H46EHRDYhAB/mWNcyE6I1gZyWcrLDObNMOrF3c5Anx44Ziomx SNPP4N6+pM7/CplQ0zvxGALV8GMq2g6tQ6iTvnOdB5gI4svEPY5Wge9jAH1wRnxyGof3hv bl4yqUk0tXqgRRd/sQmJVTzDI8WH/DzDQqEgzmx8lADQtHccEAr8LIC5n6px1UNpG6zWLS swGYC6XhumEoqjI5XtzTpapgb+exQuS7ODAe0ghl2V4WFuIeVlkyXsx1efsq46M0Yb0P2h 8AsWYYQzaFrAj7n3jTlOQQPFYxZJSQKoSPVqxOD5D+WCGWB1vWVX6ZqseUG3dg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1651954377; a=rsa-sha256; cv=none; b=stksrCU7Y4hSjWYkldAx2bmGdt9L6oyb7DdLLA/WIxGq0uPN7PvO6SjfZ3FJ6WOWbB3N2F Qccj9YcWSSS3MPJe/sHb9M/WXtKpBKOBCGwAsAn8fqUl+7slnsQFlUWfIuP+/h6vObgk5k xG+t2z3Nxp7kec+94OgaXla+GCdlX9t/aZ2d/G3W8YsREkOvCKWxtCpmcuwAuAMZOk37Sv qmpRjUnZaIn7vQTsJRiuH9t7XPCoBxs5bUV5H9JeQvJOCvEeit7Im/yAWtxHBffwNYMQYN 3kObDz48wEbNCiA3UzMCSA/0hjn2vtiVgGn8eDEF2W285J6jx69PdzssuRUf4w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N On 5/7/22 2:46 AM, Ruslan Bukin wrote: > 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, If this variable is only used under INVARIANTS, please use __diagused rather than __unused. Similarly for the other variables you marked __unused here. -- John Baldwin