powerpc64/pmap: No need for moea64_pvo_remove_from_page_locked() wrapper

The only consumer of moea64_pvo_remove_from_page_locked() already has the
page in hand, so there is no need to search for the page while holding the
lock.  Drop the wrapper, and rename _moea64_pvo_remove_from_page_locked().

Reported by:	alc
This commit is contained in:
Justin Hibbits 2019-07-13 03:39:46 +00:00
parent a5a8266af1
commit 07b57507c9

View File

@ -235,7 +235,7 @@ static int moea64_pvo_enter(mmu_t mmu, struct pvo_entry *pvo,
static void moea64_pvo_remove_from_pmap(mmu_t mmu, struct pvo_entry *pvo);
static void moea64_pvo_remove_from_page(mmu_t mmu, struct pvo_entry *pvo);
static void moea64_pvo_remove_from_page_locked(mmu_t mmu,
struct pvo_entry *pvo);
struct pvo_entry *pvo, vm_page_t m);
static struct pvo_entry *moea64_pvo_find_va(pmap_t, vm_offset_t);
/*
@ -2452,7 +2452,7 @@ moea64_remove_all(mmu_t mmu, vm_page_t m)
wasdead = (pvo->pvo_vaddr & PVO_DEAD);
if (!wasdead)
moea64_pvo_remove_from_pmap(mmu, pvo);
moea64_pvo_remove_from_page_locked(mmu, pvo);
moea64_pvo_remove_from_page_locked(mmu, pvo, m);
if (!wasdead)
LIST_INSERT_HEAD(&freequeue, pvo, pvo_vlink);
PMAP_UNLOCK(pmap);
@ -2626,7 +2626,7 @@ moea64_pvo_remove_from_pmap(mmu_t mmu, struct pvo_entry *pvo)
}
static inline void
_moea64_pvo_remove_from_page_locked(mmu_t mmu, struct pvo_entry *pvo,
moea64_pvo_remove_from_page_locked(mmu_t mmu, struct pvo_entry *pvo,
vm_page_t m)
{
@ -2654,17 +2654,6 @@ _moea64_pvo_remove_from_page_locked(mmu_t mmu, struct pvo_entry *pvo,
moea64_pvo_remove_calls++;
}
static void
moea64_pvo_remove_from_page_locked(mmu_t mmu, struct pvo_entry *pvo)
{
vm_page_t pg = NULL;
if (pvo->pvo_vaddr & PVO_MANAGED)
pg = PHYS_TO_VM_PAGE(pvo->pvo_pte.pa & LPTE_RPGN);
_moea64_pvo_remove_from_page_locked(mmu, pvo, pg);
}
static void
moea64_pvo_remove_from_page(mmu_t mmu, struct pvo_entry *pvo)
{
@ -2674,7 +2663,7 @@ moea64_pvo_remove_from_page(mmu_t mmu, struct pvo_entry *pvo)
pg = PHYS_TO_VM_PAGE(pvo->pvo_pte.pa & LPTE_RPGN);
PV_LOCK(pvo->pvo_pte.pa & LPTE_RPGN);
_moea64_pvo_remove_from_page_locked(mmu, pvo, pg);
moea64_pvo_remove_from_page_locked(mmu, pvo, pg);
PV_UNLOCK(pvo->pvo_pte.pa & LPTE_RPGN);
}