D35466.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D35466.diff
View Options

	diff --git a/sys/amd64/amd64/pmap.c b/sys/amd64/amd64/pmap.c
	--- a/sys/amd64/amd64/pmap.c
	+++ b/sys/amd64/amd64/pmap.c
	@@ -10867,18 +10867,16 @@
	vm_page_t m;

	VM_OBJECT_ASSERT_WLOCKED(pti_obj);
	- m = vm_page_grab(pti_obj, pti_pg_idx++, VM_ALLOC_NOBUSY \|
	- VM_ALLOC_WIRED \| VM_ALLOC_ZERO);
	+ m = vm_page_grab(pti_obj, pti_pg_idx++, VM_ALLOC_WIRED \| VM_ALLOC_ZERO);
	return (m);
	}

	static bool
	pmap_pti_free_page(vm_page_t m)
	{
	-
	- KASSERT(m->ref_count > 0, ("page %p not referenced", m));
	if (!vm_page_unwire_noq(m))
	return (false);
	+ vm_page_xbusy_claim(m);
	vm_page_free_zero(m);
	return (true);
	}
	@@ -10984,7 +10982,6 @@

	VM_OBJECT_ASSERT_WLOCKED(pti_obj);
	m = PHYS_TO_VM_PAGE(DMAP_TO_PHYS((uintptr_t)pde));
	- MPASS(m->ref_count > 0);
	MPASS(only_ref \|\| m->ref_count > 1);
	pmap_pti_free_page(m);
	}
	@@ -10997,7 +10994,6 @@

	VM_OBJECT_ASSERT_WLOCKED(pti_obj);
	m = PHYS_TO_VM_PAGE(DMAP_TO_PHYS((uintptr_t)pte));
	- MPASS(m->ref_count > 0);
	if (pmap_pti_free_page(m)) {
	pde = pmap_pti_pde(va);
	MPASS((*pde & (X86_PG_PS \| X86_PG_V)) == X86_PG_V);