git: 0a8e88fa7303 - main - Change __unused to __diagused.

The branch main has been updated by br:

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

commit 0a8e88fa73033d4a6d5bc11668c053ecdad58746
Author:     Ruslan Bukin <br@FreeBSD.org>
AuthorDate: 2022-05-09 10:24:47 +0000
Commit:     Ruslan Bukin <br@FreeBSD.org>
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;