From 76681d4bc6ae81d79db586f5960e4d1284f57652 Mon Sep 17 00:00:00 2001 From: alc Date: Thu, 28 Nov 2002 08:44:26 +0000 Subject: [PATCH] Use pmap_remove_all() instead of pmap_remove() before freeing the page in vm_pgmoveco(); the page may have more than one mapping. Hold the page queues lock when calling pmap_remove_all(). Approved by: re (blanket) --- sys/kern/kern_subr.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/sys/kern/kern_subr.c b/sys/kern/kern_subr.c index 065659872d6c..2df1a130a5b2 100644 --- a/sys/kern/kern_subr.c +++ b/sys/kern/kern_subr.c @@ -104,12 +104,11 @@ vm_pgmoveco(mapa, srcobj, kaddr, uaddr) return(EFAULT); } if ((user_pg = vm_page_lookup(uobject, upindex)) != NULL) { - vm_page_lock_queues(); - if (!vm_page_sleep_if_busy(user_pg, 1, "vm_pgmoveco")) - vm_page_unlock_queues(); - pmap_remove(map->pmap, uaddr, uaddr+PAGE_SIZE); - vm_page_lock_queues(); + do + vm_page_lock_queues(); + while (vm_page_sleep_if_busy(user_pg, 1, "vm_pgmoveco")); vm_page_busy(user_pg); + pmap_remove_all(user_pg); vm_page_free(user_pg); vm_page_unlock_queues(); }