git: 1c311640c0a6 - main - powerpc: Use __diagused for variables only used in KASSERT().

The branch main has been updated by jhb:

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

commit 1c311640c0a65cd5a0105481b69554b52c6017ae
Author:     John Baldwin <jhb@FreeBSD.org>
AuthorDate: 2022-04-13 23:08:23 +0000
Commit:     John Baldwin <jhb@FreeBSD.org>
CommitDate: 2022-04-13 23:08:23 +0000

    powerpc: Use __diagused for variables only used in KASSERT().
---
 sys/powerpc/aim/mmu_oea64.c    | 6 +++---
 sys/powerpc/pseries/mmu_phyp.c | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/sys/powerpc/aim/mmu_oea64.c b/sys/powerpc/aim/mmu_oea64.c
index a066511a863e..ba8e8bf23fb4 100644
--- a/sys/powerpc/aim/mmu_oea64.c
+++ b/sys/powerpc/aim/mmu_oea64.c
@@ -3683,7 +3683,7 @@ moea64_sp_enter(pmap_t pmap, vm_offset_t va, vm_page_t m,
 	vm_paddr_t pa, spa;
 	bool sync;
 	struct pvo_dlist tofree;
-	int error, i;
+	int error __diagused, i;
 	uint16_t aflags;
 
 	KASSERT((va & HPT_SP_MASK) == 0, ("%s: va %#jx unaligned",
@@ -3924,7 +3924,7 @@ moea64_sp_demote_aligned(struct pvo_entry *sp)
 	vm_offset_t va, va_end;
 	vm_paddr_t pa;
 	vm_page_t m;
-	pmap_t pmap;
+	pmap_t pmap __diagused;
 	int64_t refchg;
 
 	CTR2(KTR_PMAP, "%s: va=%#jx", __func__, (uintmax_t)PVO_VADDR(sp));
@@ -4084,7 +4084,7 @@ moea64_sp_remove(struct pvo_entry *sp, struct pvo_dlist *tofree)
 {
 	struct pvo_entry *pvo, *tpvo;
 	vm_offset_t eva;
-	pmap_t pm;
+	pmap_t pm __diagused;
 
 	CTR2(KTR_PMAP, "%s: va=%#jx", __func__, (uintmax_t)PVO_VADDR(sp));
 
diff --git a/sys/powerpc/pseries/mmu_phyp.c b/sys/powerpc/pseries/mmu_phyp.c
index 5769f0db5572..67d0b5821f4f 100644
--- a/sys/powerpc/pseries/mmu_phyp.c
+++ b/sys/powerpc/pseries/mmu_phyp.c
@@ -320,7 +320,7 @@ mphyp_pte_clear(struct pvo_entry *pvo, uint64_t ptebit)
 	struct rm_priotracker track;
 	int64_t refchg;
 	uint64_t ptelo, junk;
-	int err;
+	int err __diagused;
 
 	/*
 	 * This involves two steps (synch and clear) so we need the entry
@@ -589,7 +589,7 @@ mphyp_pte_unset_sp(struct pvo_entry *pvo)
 	uint64_t junk, refchg;
 	int err;
 	vm_offset_t eva;
-	pmap_t pm;
+	pmap_t pm __diagused;
 
 	pm = pvo->pvo_pmap;
 	PMAP_LOCK_ASSERT(pm, MA_OWNED);
@@ -624,7 +624,7 @@ mphyp_pte_insert_sp(struct pvo_entry *pvo)
 	int64_t ret;
 	struct lpte pte;
 	vm_offset_t eva;
-	pmap_t pm;
+	pmap_t pm __diagused;
 
 	pm = pvo->pvo_pmap;
 	PMAP_LOCK_ASSERT(pm, MA_OWNED);