diff options
| author | Alan Cox <alc@FreeBSD.org> | 2003-10-08 07:11:19 +0000 |
|---|---|---|
| committer | Alan Cox <alc@FreeBSD.org> | 2003-10-08 07:11:19 +0000 |
| commit | 8afcf0cc36324052cc77779687e083550ef67920 (patch) | |
| tree | 71b3adef6c9e8eeac3948a6b556046db647c7281 /sys | |
| parent | 669890eaeb860ce6c546207378b3fe4b03d4bb2e (diff) | |
Notes
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/vm/vm_fault.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/sys/vm/vm_fault.c b/sys/vm/vm_fault.c index 279358c7cc5d..5d8dec3624d9 100644 --- a/sys/vm/vm_fault.c +++ b/sys/vm/vm_fault.c @@ -1147,6 +1147,7 @@ vm_fault_copy_entry(dst_map, src_map, dst_entry, src_entry) dst_object = vm_object_allocate(OBJT_DEFAULT, (vm_size_t) OFF_TO_IDX(dst_entry->end - dst_entry->start)); + VM_OBJECT_LOCK(dst_object); dst_entry->object.vm_object = dst_object; dst_entry->offset = 0; @@ -1168,7 +1169,9 @@ vm_fault_copy_entry(dst_map, src_map, dst_entry, src_entry) dst_m = vm_page_alloc(dst_object, OFF_TO_IDX(dst_offset), VM_ALLOC_NORMAL); if (dst_m == NULL) { + VM_OBJECT_UNLOCK(dst_object); VM_WAIT; + VM_OBJECT_LOCK(dst_object); } } while (dst_m == NULL); @@ -1180,17 +1183,18 @@ vm_fault_copy_entry(dst_map, src_map, dst_entry, src_entry) VM_OBJECT_LOCK(src_object); src_m = vm_page_lookup(src_object, OFF_TO_IDX(dst_offset + src_offset)); - VM_OBJECT_UNLOCK(src_object); if (src_m == NULL) panic("vm_fault_copy_wired: page missing"); - pmap_copy_page(src_m, dst_m); + VM_OBJECT_UNLOCK(src_object); dst_m->valid = VM_PAGE_BITS_ALL; + VM_OBJECT_UNLOCK(dst_object); /* * Enter it in the pmap... */ pmap_enter(dst_map->pmap, vaddr, dst_m, prot, FALSE); + VM_OBJECT_LOCK(dst_object); vm_page_lock_queues(); vm_page_flag_set(dst_m, PG_WRITEABLE); @@ -1201,6 +1205,7 @@ vm_fault_copy_entry(dst_map, src_map, dst_entry, src_entry) vm_page_wakeup(dst_m); vm_page_unlock_queues(); } + VM_OBJECT_UNLOCK(dst_object); } |