From nobody Mon May 09 10:25:59 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 51C991AC012E;
Mon, 9 May 2022 10:25:59 +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 4KxclC1sdJz4vWr;
Mon, 9 May 2022 10:25:59 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1652091959;
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=h5/QMfXYm86+g9muOKPaZxajuNzn659quaf3U2NhIug=;
b=lilleOTSG7kpe8LzB4GAJqRv3ny6t4jn3Cm5WsdIT2g86erRaXL5auX1vqzPaITedH/FjX
3t8/dbtRrrggdYNFFUq3dfiS8NVJMaSwB1C5ziet3r5LK5OtgDiwHdJn4+4w/oshJqScNl
4JGK4zYvc4bT42yeE1pD/rjrazqOvqoHMw+Ul7QphfulAZrl0XYw/oU3ILFvXDUFm79dnQ
fPM9RPHAE9hB2BVOxteS4gN4dE4W99JGl9STb+1v0WUr/Rm5+3sp9McQBMhIKNfGpilpRn
9JGXwzHxnap7uHast+HZTvaT7x1luJ+M2O3mk0BX6rMSb3Zsu6jmrx5FwaaNoQ==
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 1FE207605;
Mon, 9 May 2022 10:25:59 +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 249APxU2056579;
Mon, 9 May 2022 10:25:59 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 249APxU3056578;
Mon, 9 May 2022 10:25:59 GMT
(envelope-from git)
Date: Mon, 9 May 2022 10:25:59 GMT
Message-Id: <202205091025.249APxU3056578@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: 0a8e88fa7303 - main - Change __unused to __diagused.
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: 0a8e88fa73033d4a6d5bc11668c053ecdad58746
Auto-Submitted: auto-generated
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1652091959;
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=h5/QMfXYm86+g9muOKPaZxajuNzn659quaf3U2NhIug=;
b=JGx9rW0MBmSg3Yi9F6JxivXLfpdNK3PdNtUcqO+GJFaoOnAEwrJmOruwr9DljJ53IgppW/
DkL1bwwnJLKJyRtORHeL0LWFU9CxmXOATzDYWxrUnbYKV6IsChxI3zMf6jFxTcF6U1Zzzy
4+Mxt1hl6XgSfsRfxbO0XPHmADXPmmDGODvXibGKRfzMzdxcnR0boLg5FvzzDfpIhEZdQG
VYq38Nl1AzTODs0kfdChnlkFbrJOcEAne3ZVZKV0cHrAFKz4mbQPpdzi7PB7QVwTZcTFu4
OjxInjhD5tX6E7n2x/iqmADWs7K5CfzkBXDwyvuhGadQNYG7d/9Fa3t45QsYWg==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1652091959; a=rsa-sha256; cv=none;
b=S28kZ1OOWxK1KjHTPmxHt+q1XQ38MZf85T3H4roEo4OqBH1C9tjTNLfNvylJvFzukrblcQ
4jmXtfBsy35XmbhCq1iE5/huJUKnh7xX5SEddA5+xaU3snvdeXiGFvxtTPIQ5uwzOFCS8U
S+AX/Ys75MAQiKoJ/r8gCSr2rQU7ce+pIAan+gNckLEtSvJgg3X5kVURJ5YEXEiKfrDp5o
7ZOmdGm9hKBywup3hg87RuauVDeFa7+TZMcsZI8jui4dts1p06lv+xqOBBEMHYlpyia+H5
iYupFGZKLC1DfdWLLavggtCf9ZkvP41VZXTmcLvBHe0h7djxrB3IN4dLvMuTpA==
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=0a8e88fa73033d4a6d5bc11668c053ecdad58746
commit 0a8e88fa73033d4a6d5bc11668c053ecdad58746
Author: Ruslan Bukin
AuthorDate: 2022-05-09 10:24:47 +0000
Commit: Ruslan Bukin
CommitDate: 2022-05-09 10:24:47 +0000
Change __unused to __diagused.
Pointed out by: jhb
Sponsored by: UKRI
---
sys/arm64/iommu/iommu.c | 2 +-
sys/arm64/iommu/iommu_pmap.c | 6 +++---
sys/arm64/iommu/smmu.c | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/sys/arm64/iommu/iommu.c b/sys/arm64/iommu/iommu.c
index 36f3dad290d5..447f3e141610 100644
--- a/sys/arm64/iommu/iommu.c
+++ b/sys/arm64/iommu/iommu.c
@@ -300,7 +300,7 @@ iommu_domain_unload(struct iommu_domain *iodom,
struct iommu_map_entries_tailq *entries, bool cansleep)
{
struct iommu_map_entry *entry, *entry1;
- int error __unused;
+ int error __diagused;
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 06775efedfe9..5f3873044f02 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 __unused;
+ boolean_t rv __diagused;
struct spglist free;
vm_page_t m;
@@ -604,7 +604,7 @@ pmap_gpu_enter(pmap_t pmap, vm_offset_t va, vm_paddr_t pa,
{
pd_entry_t *pde;
pt_entry_t new_l3;
- pt_entry_t orig_l3 __unused;
+ pt_entry_t orig_l3 __diagused;
pt_entry_t *l3;
vm_page_t mpte;
pd_entry_t *l1p;
@@ -722,7 +722,7 @@ pmap_smmu_enter(pmap_t pmap, vm_offset_t va, vm_paddr_t pa,
{
pd_entry_t *pde;
pt_entry_t new_l3;
- pt_entry_t orig_l3 __unused;
+ pt_entry_t orig_l3 __diagused;
pt_entry_t *l3;
vm_page_t mpte;
int lvl;
diff --git a/sys/arm64/iommu/smmu.c b/sys/arm64/iommu/smmu.c
index 74b68ce1d07a..f3e434c02e3f 100644
--- a/sys/arm64/iommu/smmu.c
+++ b/sys/arm64/iommu/smmu.c
@@ -1874,7 +1874,7 @@ smmu_ctx_lookup_by_sid(device_t dev, u_int sid)
static struct iommu_ctx *
smmu_ctx_lookup(device_t dev, device_t child)
{
- struct iommu_unit *iommu __unused;
+ struct iommu_unit *iommu __diagused;
struct smmu_softc *sc;
struct smmu_domain *domain;
struct smmu_unit *unit;