git: b40538683ac2 - main - Apply r355991(50079417a5c28caeca3f423b981047db76e8f5cb) to powerpc64

[Justin Hibbits]

The branch main has been updated by jhibbits:

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

commit b40538683ac2486431ae9e6039124387cea3097f
Author:     Justin Hibbits <jhibbits at FreeBSD.org>
AuthorDate: 2021-05-29 20:14:26 +0000
Commit:     Justin Hibbits <jhibbits at FreeBSD.org>
CommitDate: 2021-05-29 20:14:26 +0000

    Apply r355991(50079417a5c28caeca3f423b981047db76e8f5cb) to powerpc64
    
    Micro-optimize control flow in _pmap_unwire_ptp(), and eliminate
    unnecessary parentheses.
---
 sys/powerpc/aim/mmu_radix.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys/powerpc/aim/mmu_radix.c b/sys/powerpc/aim/mmu_radix.c
index 6ab2edf17dd9..8f38b57e7852 100644
--- a/sys/powerpc/aim/mmu_radix.c
+++ b/sys/powerpc/aim/mmu_radix.c
@@ -4722,7 +4722,7 @@ _pmap_unwire_ptp(pmap_t pmap, vm_offset_t va, vm_page_t m, struct spglist *free)
 	/*
 	 * unmap the page table page
 	 */
-	if (m->pindex >= (NUPDE + NUPDPE)) {
+	if (m->pindex >= NUPDE + NUPDPE) {
 		/* PDP page */
 		pml1_entry_t *pml1;
 		pml1 = pmap_pml1e(pmap, va);
@@ -4746,7 +4746,7 @@ _pmap_unwire_ptp(pmap_t pmap, vm_offset_t va, vm_page_t m, struct spglist *free)
 		pdpg = PHYS_TO_VM_PAGE(be64toh(*pmap_pml2e(pmap, va)) & PG_FRAME);
 		pmap_unwire_ptp(pmap, va, pdpg, free);
 	}
-	if (m->pindex >= NUPDE && m->pindex < (NUPDE + NUPDPE)) {
+	else if (m->pindex >= NUPDE && m->pindex < (NUPDE + NUPDPE)) {
 		/* We just released a PD, unhold the matching PDP */
 		vm_page_t pdppg;