diff options
Diffstat (limited to 'sys/vm/vm_fault.c')
| -rw-r--r-- | sys/vm/vm_fault.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/sys/vm/vm_fault.c b/sys/vm/vm_fault.c index 0e2a13c6291..cbf765aab9e 100644 --- a/sys/vm/vm_fault.c +++ b/sys/vm/vm_fault.c @@ -1,5 +1,5 @@ -/* $OpenBSD: vm_fault.c,v 1.13 1997/11/06 05:59:32 csapuntz Exp $ */ -/* $NetBSD: vm_fault.c,v 1.20 1997/02/18 13:39:33 mrg Exp $ */ +/* $OpenBSD: vm_fault.c,v 1.14 1998/03/01 00:38:04 niklas Exp $ */ +/* $NetBSD: vm_fault.c,v 1.21 1998/01/31 04:02:39 ross Exp $ */ /* * Copyright (c) 1991, 1993 @@ -245,7 +245,7 @@ vm_fault(map, vaddr, fault_type, change_wiring) PAGE_ASSERT_WAIT(m, !change_wiring); UNLOCK_THINGS; - thread_block(); + thread_block("mFltbsy"); wait_result = current_thread()->wait_result; vm_object_deallocate(first_object); if (wait_result != THREAD_AWAKENED) @@ -255,7 +255,7 @@ vm_fault(map, vaddr, fault_type, change_wiring) PAGE_ASSERT_WAIT(m, !change_wiring); UNLOCK_THINGS; cnt.v_intrans++; - thread_block(); + thread_block("mFltbsy2"); vm_object_deallocate(first_object); goto RetryFault; #endif @@ -300,7 +300,7 @@ vm_fault(map, vaddr, fault_type, change_wiring) if (m == NULL) { UNLOCK_AND_DEALLOCATE; - VM_WAIT; + vm_wait("fVfault1"); goto RetryFault; } } @@ -574,7 +574,7 @@ vm_fault(map, vaddr, fault_type, change_wiring) copy_object->ref_count--; vm_object_unlock(copy_object); UNLOCK_THINGS; - thread_block(); + thread_block("mCpybsy"); wait_result = current_thread()->wait_result; vm_object_deallocate(first_object); @@ -592,7 +592,7 @@ vm_fault(map, vaddr, fault_type, change_wiring) copy_object->ref_count--; vm_object_unlock(copy_object); UNLOCK_THINGS; - thread_block(); + thread_block("mCpybsy2"); vm_object_deallocate(first_object); goto RetryFault; #endif @@ -627,7 +627,7 @@ vm_fault(map, vaddr, fault_type, change_wiring) copy_object->ref_count--; vm_object_unlock(copy_object); UNLOCK_AND_DEALLOCATE; - VM_WAIT; + vm_wait("fCopy"); goto RetryFault; } @@ -986,7 +986,7 @@ vm_fault_copy_entry(dst_map, src_map, dst_entry, src_entry) dst_m = vm_page_alloc(dst_object, dst_offset); if (dst_m == NULL) { vm_object_unlock(dst_object); - VM_WAIT; + vm_wait("fVm_copy"); vm_object_lock(dst_object); } } while (dst_m == NULL); |