diff options
| author | mckusick <mckusick@FreeBSD.org> | 2010-05-06 17:37:23 +0000 |
|---|---|---|
| committer | mckusick <mckusick@FreeBSD.org> | 2010-05-06 17:37:23 +0000 |
| commit | b25e55dcc52d6203a9ae995ca470a66b6483f71d (patch) | |
| tree | 781f2c991a11a3806fdb0891b7a615cb77ebe3ab /sys/kern/kern_exec.c | |
| parent | 3a0f5972a0de87aebef1af257922515700da4217 (diff) | |
| parent | f3856c6cf2fb115757967b7e32bdeb21bd27d1ee (diff) | |
| download | FreeBSD-src-b25e55dcc52d6203a9ae995ca470a66b6483f71d.zip FreeBSD-src-b25e55dcc52d6203a9ae995ca470a66b6483f71d.tar.gz | |
Final update to current version of head in preparation for reintegration.
Diffstat (limited to 'sys/kern/kern_exec.c')
| -rw-r--r-- | sys/kern/kern_exec.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/sys/kern/kern_exec.c b/sys/kern/kern_exec.c index ed22519..0ec9817 100644 --- a/sys/kern/kern_exec.c +++ b/sys/kern/kern_exec.c @@ -949,17 +949,19 @@ exec_map_first_page(imgp) ma[0] = vm_page_lookup(object, 0); if ((rv != VM_PAGER_OK) || (ma[0] == NULL)) { if (ma[0]) { + vm_page_lock(ma[0]); vm_page_lock_queues(); vm_page_free(ma[0]); vm_page_unlock_queues(); + vm_page_unlock(ma[0]); } VM_OBJECT_UNLOCK(object); return (EIO); } } - vm_page_lock_queues(); + vm_page_lock(ma[0]); vm_page_hold(ma[0]); - vm_page_unlock_queues(); + vm_page_unlock(ma[0]); vm_page_wakeup(ma[0]); VM_OBJECT_UNLOCK(object); @@ -979,9 +981,9 @@ exec_unmap_first_page(imgp) m = sf_buf_page(imgp->firstpage); sf_buf_free(imgp->firstpage); imgp->firstpage = NULL; - vm_page_lock_queues(); + vm_page_lock(m); vm_page_unhold(m); - vm_page_unlock_queues(); + vm_page_unlock(m); } } |
