xnu-3789.31.2.tar.gz

[apple/xnu.git] / osfmk / vm / vm_swapfile_pager.c

diff --git a/osfmk/vm/vm_swapfile_pager.c b/osfmk/vm/vm_swapfile_pager.c
index 4739455df9b04aaf1f62ad73bfb6cfa1019ec4f5..e50177fdb8fde258c7ed2d59a5ce76a959765382 100644 (file)
--- a/osfmk/vm/vm_swapfile_pager.c
+++ b/osfmk/vm/vm_swapfile_pager.c
@@ -380,8 +380,8 @@ swapfile_pager_data_request(
                retval = kr;
                goto done;
        }
-       map_entry->object.vm_object = kernel_object;
-       map_entry->offset = kernel_mapping - VM_MIN_KERNEL_ADDRESS;
+       VME_OBJECT_SET(map_entry, kernel_object);
+       VME_OFFSET_SET(map_entry, kernel_mapping - VM_MIN_KERNEL_ADDRESS);
        vm_map_unlock(kernel_map);
        dst_vaddr = CAST_DOWN(vm_offset_t, kernel_mapping);
        dst_ptr = (char *) dst_vaddr;
@@ -412,6 +412,7 @@ swapfile_pager_data_request(
                           kernel_mapping,
                           dst_pnum,
                           VM_PROT_READ | VM_PROT_WRITE,
+                          VM_PROT_NONE,
                           0,
                           TRUE);
 
@@ -727,7 +728,7 @@ swapfile_pager_lookup(
 {
        swapfile_pager_t        pager;
 
-       pager = (swapfile_pager_t) mem_obj;
+       __IGNORE_WCASTALIGN(pager = (swapfile_pager_t) mem_obj);
        assert(pager->pager_ops == &swapfile_pager_ops);
        assert(pager->ref_count > 0);
        return pager;