git: c9d26ca24c8b - main - ppc mmoea64: Workaround set but unused warnings for RB_NEXT.

[John Baldwin]

The branch main has been updated by jhb:

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

commit c9d26ca24c8b962f9c1e3a2044c8d98c328d8c42
Author:     John Baldwin <j...@freebsd.org>
AuthorDate: 2022-04-12 21:58:58 +0000
Commit:     John Baldwin <j...@freebsd.org>
CommitDate: 2022-04-12 21:58:58 +0000

    ppc mmoea64: Workaround set but unused warnings for RB_NEXT.
    
    Inline the unused expression passed as the second argument to RB_NEXT.
---
 sys/powerpc/aim/moea64_native.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/sys/powerpc/aim/moea64_native.c b/sys/powerpc/aim/moea64_native.c
index 367b99856502..167c4ea064b1 100644
--- a/sys/powerpc/aim/moea64_native.c
+++ b/sys/powerpc/aim/moea64_native.c
@@ -925,14 +925,12 @@ moea64_pte_unset_sp_locked(struct pvo_entry *pvo)
        volatile struct lpte *pt;
        uint64_t ptehi, refchg, vpn;
        vm_offset_t eva;
-       pmap_t pm;
 
-       pm = pvo->pvo_pmap;
        refchg = 0;
        eva = PVO_VADDR(pvo) + HPT_SP_SIZE;
 
        for (; pvo != NULL && PVO_VADDR(pvo) < eva;
-           pvo = RB_NEXT(pvo_tree, &pm->pmap_pvo, pvo)) {
+           pvo = RB_NEXT(pvo_tree, &pvo->pvo_pmap->pmap_pvo, pvo)) {
                pt = moea64_pteg_table + pvo->pvo_pte.slot;
                ptehi = be64toh(pt->pte_hi);
                if ((ptehi & LPTE_AVPN_MASK) !=
@@ -975,13 +973,11 @@ moea64_pte_insert_sp_locked(struct pvo_entry *pvo)
        struct lpte insertpt;
        int64_t ret;
        vm_offset_t eva;
-       pmap_t pm;
 
-       pm = pvo->pvo_pmap;
        eva = PVO_VADDR(pvo) + HPT_SP_SIZE;
 
        for (; pvo != NULL && PVO_VADDR(pvo) < eva;
-           pvo = RB_NEXT(pvo_tree, &pm->pmap_pvo, pvo)) {
+           pvo = RB_NEXT(pvo_tree, &pvo->pvo_pmap->pmap_pvo, pvo)) {
                moea64_pte_from_pvo(pvo, &insertpt);
                pvo->pvo_pte.slot &= ~7ULL; /* Base slot address */