D30832.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D30832.diff
View Options

	diff --git a/sys/arm64/arm64/pmap.c b/sys/arm64/arm64/pmap.c
	--- a/sys/arm64/arm64/pmap.c
	+++ b/sys/arm64/arm64/pmap.c
	@@ -3474,7 +3474,7 @@
	va = va & ~L2_OFFSET;
	pv = pmap_pvh_remove(&m->md, pmap, va);
	KASSERT(pv != NULL, ("pmap_pv_promote_l2: pv not found"));
	- pvh = pa_to_pvh(pa);
	+ pvh = page_to_pvh(m);
	TAILQ_INSERT_TAIL(&pvh->pv_list, pv, pv_next);
	pvh->pv_gen++;
	/* Free the remaining NPTEPG - 1 pv entries. */
	@@ -3896,7 +3896,7 @@
	if ((om->a.flags & PGA_WRITEABLE) != 0 &&
	TAILQ_EMPTY(&om->md.pv_list) &&
	((om->flags & PG_FICTITIOUS) != 0 \|\|
	- TAILQ_EMPTY(&pa_to_pvh(opa)->pv_list)))
	+ TAILQ_EMPTY(&page_to_pvh(om)->pv_list)))
	vm_page_aflag_clear(om, PGA_WRITEABLE);
	} else {
	KASSERT((orig_l3 & ATTR_AF) != 0,
	@@ -5000,7 +5000,7 @@
	case 1:
	pmap_resident_count_dec(pmap,
	L2_SIZE / PAGE_SIZE);
	- pvh = pa_to_pvh(tpte & ~ATTR_MASK);
	+ pvh = page_to_pvh(m);
	TAILQ_REMOVE(&pvh->pv_list, pv,pv_next);
	pvh->pv_gen++;
	if (TAILQ_EMPTY(&pvh->pv_list)) {