Back out all the pmap related stuff I've touched over the last few days.

There is some unresolved badness that has been eluding me, particularly
affecting uniprocessor kernels.  Turning off PG_G helped (which is a bad
sign) but didn't solve it entirely.  Userland programs still crashed.

1 files changed, 2 insertions, 2 deletions

diff --git a/sys/vm/vm_pager.c b/sys/vm/vm_pager.c
index 3a529b6f9eed..6cb678a9d471 100644
--- a/sys/vm/vm_pager.c
+++ b/sys/vm/vm_pager.c
@@ -318,7 +318,7 @@ vm_pager_map_page(m)
 	vm_offset_t kva;
 
 	kva = kmem_alloc_wait(pager_map, PAGE_SIZE);
-	pmap_qenter(kva, &m, 1);
+	pmap_kenter(kva, VM_PAGE_TO_PHYS(m));
 	return (kva);
 }
 
@@ -326,7 +326,7 @@ void
 vm_pager_unmap_page(kva)
 	vm_offset_t kva;
 {
-	pmap_qremove(kva, 1);
+	pmap_kremove(kva);
 	kmem_free_wakeup(pager_map, kva, PAGE_SIZE);
 }