From 2952e1fb58aa245bee3cc3bedf69dd7861175fed Mon Sep 17 00:00:00 2001 From: Alan Cox Date: Fri, 20 Dec 2002 21:18:29 +0000 Subject: [PATCH] Extend the scope of the page queues lock in vm_pgmoveco(). --- sys/kern/kern_subr.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/kern/kern_subr.c b/sys/kern/kern_subr.c index 07708fc1a39..bfea8bc2b48 100644 --- a/sys/kern/kern_subr.c +++ b/sys/kern/kern_subr.c @@ -110,9 +110,8 @@ vm_pgmoveco(mapa, srcobj, kaddr, uaddr) vm_page_busy(user_pg); pmap_remove_all(user_pg); vm_page_free(user_pg); - vm_page_unlock_queues(); - } - + } else + vm_page_lock_queues(); if (kern_pg->busy || ((kern_pg->queue - kern_pg->pc) == PQ_FREE) || (kern_pg->hold_count != 0)|| (kern_pg->flags & PG_BUSY)) { printf("vm_pgmoveco: pindex(%lu), busy(%d), PG_BUSY(%d), " @@ -125,12 +124,13 @@ vm_pgmoveco(mapa, srcobj, kaddr, uaddr) panic("vm_pgmoveco: renaming busy page"); } kpindex = kern_pg->pindex; - vm_page_lock_queues(); vm_page_busy(kern_pg); vm_page_unlock_queues(); vm_page_rename(kern_pg, uobject, upindex); + vm_page_lock_queues(); vm_page_flag_clear(kern_pg, PG_BUSY); kern_pg->valid = VM_PAGE_BITS_ALL; + vm_page_unlock_queues(); vm_map_lookup_done(map, entry); return(KERN_SUCCESS);