xnu-792.24.17.tar.gz
[apple/xnu.git] / osfmk / vm / vm_fault.c
index c601cb0da3d6c82c424c9e68295bff9157c083d1..e2aa4851f127e8a20928e1af2ce14a61fa1b5bfd 100644 (file)
@@ -3081,8 +3081,8 @@ FastPmapEnter:
                                    (entry->object.vm_object->shadow_offset)) 
                                        + entry->offset + 
                                        (laddr - entry->vme_start) 
-                                                       - ldelta)>>12,
-                               ldelta + hdelta, prot, 
+                                                       - ldelta) >> 12,
+                               ((ldelta + hdelta) >> 12), prot, 
                                (VM_WIMG_MASK & (int)object->wimg_bits), 0);
                        } else { 
                                /* Set up a block mapped area */
@@ -3091,8 +3091,8 @@ FastPmapEnter:
                                   (((vm_map_offset_t)
                                    (entry->object.vm_object->shadow_offset)) 
                                       + entry->offset + 
-                                      (laddr - entry->vme_start) - ldelta)>>12,
-                                  ldelta + hdelta, prot, 
+                                      (laddr - entry->vme_start) - ldelta) >> 12,
+                                  ((ldelta + hdelta) >> 12), prot, 
                                   (VM_WIMG_MASK & (int)object->wimg_bits), 0);
                        }
                }
@@ -3399,8 +3399,8 @@ vm_fault_wire_fast(
 
 #undef UNLOCK_THINGS
 #define UNLOCK_THINGS  {                               \
-       object->paging_in_progress--;                   \
-       vm_object_unlock(object);                       \
+       vm_object_paging_end(object);                      \
+       vm_object_unlock(object);                          \
 }
 
 #undef UNLOCK_AND_DEALLOCATE
@@ -3441,7 +3441,7 @@ vm_fault_wire_fast(
        assert(object->ref_count > 0);
        object->ref_count++;
        vm_object_res_reference(object);
-       object->paging_in_progress++;
+       vm_object_paging_begin(object);
 
        /*
         *      INVARIANTS (through entire routine):