diff options
Diffstat (limited to 'vm/vm_fault.c')
| -rw-r--r-- | vm/vm_fault.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/vm/vm_fault.c b/vm/vm_fault.c index df7b2c41..d99425a3 100644 --- a/vm/vm_fault.c +++ b/vm/vm_fault.c @@ -70,7 +70,7 @@ typedef struct vm_fault_state { vm_offset_t vmf_vaddr; vm_prot_t vmf_fault_type; boolean_t vmf_change_wiring; - void (*vmf_continuation)(); + vm_fault_continuation_t vmf_continuation; vm_map_version_t vmf_version; boolean_t vmf_wired; struct vm_object *vmf_object; @@ -218,7 +218,7 @@ vm_fault_return_t vm_fault_page( */ /* More arguments: */ boolean_t resume, /* We are restarting. */ - void (*continuation)()) /* Continuation for blocking. */ + continuation_t continuation) /* Continuation for blocking. */ { vm_page_t m; vm_object_t object; @@ -347,7 +347,7 @@ vm_fault_return_t vm_fault_page( PAGE_ASSERT_WAIT(m, interruptible); vm_object_unlock(object); - if (continuation != (void (*)()) 0) { + if (continuation != thread_no_continuation) { vm_fault_state_t *state = (vm_fault_state_t *) current_thread()->ith_other; @@ -652,7 +652,7 @@ vm_fault_return_t vm_fault_page( m->offset + object->paging_offset, PAGE_SIZE, access_required)) != KERN_SUCCESS) { if (object->pager && rc != MACH_SEND_INTERRUPTED) - printf("%s(0x%p, 0x%p, 0x%lx, 0x%x, 0x%x) failed, %x\n", + printf("%s(0x%p, 0x%p, 0x%zx, 0x%x, 0x%x) failed, %x\n", "memory_object_data_request", object->pager, object->pager_request, @@ -1082,7 +1082,7 @@ vm_fault_return_t vm_fault_page( block_and_backoff: vm_fault_cleanup(object, first_m); - if (continuation != (void (*)()) 0) { + if (continuation != thread_no_continuation) { vm_fault_state_t *state = (vm_fault_state_t *) current_thread()->ith_other; @@ -1129,7 +1129,7 @@ vm_fault_return_t vm_fault_page( * and deallocated when leaving vm_fault. */ -void +static void vm_fault_continue(void) { vm_fault_state_t *state = @@ -1149,7 +1149,7 @@ kern_return_t vm_fault( vm_prot_t fault_type, boolean_t change_wiring, boolean_t resume, - void (*continuation)()) + vm_fault_continuation_t continuation) { vm_map_version_t version; /* Map version for verificiation */ boolean_t wired; /* Should mapping be wired down? */ @@ -1187,7 +1187,7 @@ kern_return_t vm_fault( goto after_vm_fault_page; } - if (continuation != (void (*)()) 0) { + if (continuation != vm_fault_no_continuation) { /* * We will probably need to save state. */ @@ -1213,7 +1213,7 @@ kern_return_t vm_fault( * it to begin the search. */ - if ((kr = vm_map_lookup(&map, vaddr, fault_type, &version, + if ((kr = vm_map_lookup(&map, vaddr, fault_type, FALSE, &version, &object, &offset, &prot, &wired)) != KERN_SUCCESS) { goto done; @@ -1239,7 +1239,7 @@ kern_return_t vm_fault( object->ref_count++; vm_object_paging_begin(object); - if (continuation != (void (*)()) 0) { + if (continuation != vm_fault_no_continuation) { vm_fault_state_t *state = (vm_fault_state_t *) current_thread()->ith_other; @@ -1293,7 +1293,7 @@ kern_return_t vm_fault( kr = KERN_SUCCESS; goto done; case VM_FAULT_MEMORY_SHORTAGE: - if (continuation != (void (*)()) 0) { + if (continuation != vm_fault_no_continuation) { vm_fault_state_t *state = (vm_fault_state_t *) current_thread()->ith_other; @@ -1375,7 +1375,7 @@ kern_return_t vm_fault( * take another fault. */ kr = vm_map_lookup(&map, vaddr, - fault_type & ~VM_PROT_WRITE, &version, + fault_type & ~VM_PROT_WRITE, FALSE, &version, &retry_object, &retry_offset, &retry_prot, &wired); @@ -1476,7 +1476,7 @@ kern_return_t vm_fault( #undef RELEASE_PAGE done: - if (continuation != (void (*)()) 0) { + if (continuation != vm_fault_no_continuation) { vm_fault_state_t *state = (vm_fault_state_t *) current_thread()->ith_other; @@ -1767,7 +1767,7 @@ kern_return_t vm_fault_wire_fast( * Release a page used by vm_fault_copy. */ -void vm_fault_copy_cleanup( +static void vm_fault_copy_cleanup( vm_page_t page, vm_page_t top_page) { |