D42291.diff
No OneTemporary
Actions

Size

839 B

Referenced Files

None

Subscribers

None

D42291.diff
View Options

	diff --git a/sys/riscv/riscv/pmap.c b/sys/riscv/riscv/pmap.c
	--- a/sys/riscv/riscv/pmap.c
	+++ b/sys/riscv/riscv/pmap.c
	@@ -3458,11 +3458,9 @@
	if (l3 == NULL)
	panic("pmap_enter_quick_locked: No l3");
	if (pmap_load(l3) != 0) {
	- if (mpte != NULL) {
	+ if (mpte != NULL)
	mpte->ref_count--;
	- mpte = NULL;
	- }
	- return (mpte);
	+ return (NULL);
	}

	/*
	@@ -3472,13 +3470,10 @@
	!pmap_try_insert_pv_entry(pmap, va, m, lockp)) {
	if (mpte != NULL) {
	SLIST_INIT(&free);
	- if (pmap_unwire_ptp(pmap, va, mpte, &free)) {
	- pmap_invalidate_page(pmap, va);
	+ if (pmap_unwire_ptp(pmap, va, mpte, &free))
	vm_page_free_pages_toq(&free, false);
	- }
	- mpte = NULL;
	}
	- return (mpte);
	+ return (NULL);
	}

	/*
	@@ -3524,7 +3519,6 @@
	}
	#endif

	- pmap_invalidate_page(pmap, va);
	return (mpte);
	}