xnu-1228.9.59.tar.gz

[apple/xnu.git] / osfmk / vm / vm_protos.h

diff --git a/osfmk/vm/vm_protos.h b/osfmk/vm/vm_protos.h
index f1d0f65aff357f59f59e6ae957c620f650d0148a..e9fdc6ef332fc37f78f34107f64879da9c53a7cf 100644 (file)
--- a/osfmk/vm/vm_protos.h
+++ b/osfmk/vm/vm_protos.h
@@ -144,15 +144,17 @@ extern mach_vm_offset_t mach_get_vm_end(vm_map_t);
 extern vm_offset_t get_vm_start(vm_map_t);
 extern vm_offset_t get_vm_end(vm_map_t);
 
-#ifdef __i386__
+#if CONFIG_CODE_DECRYPTION
+struct pager_crypt_info;
 extern kern_return_t vm_map_apple_protected(
-       vm_map_t        map,
-       vm_map_offset_t start,
-       vm_map_offset_t end);
+                                           vm_map_t    map,
+                                           vm_map_offset_t     start,
+                                           vm_map_offset_t     end,
+                                           struct pager_crypt_info *crypt_info);
 extern void apple_protect_pager_bootstrap(void);
-extern memory_object_t apple_protect_pager_setup(vm_object_t backing_object);
-extern void apple_protect_pager_map(memory_object_t mem_obj);
-#endif /* __i386__ */
+extern memory_object_t apple_protect_pager_setup(vm_object_t backing_object,
+                                                struct pager_crypt_info *crypt_info);
+#endif /* CONFIG_CODE_DECRYPTION */
 
 
 /*
@@ -238,7 +240,10 @@ extern kern_return_t vnode_pager_synchronize(
        memory_object_offset_t  offset,
        vm_size_t               length,
        vm_sync_t               sync_flags);
-extern kern_return_t vnode_pager_unmap(
+extern kern_return_t vnode_pager_map(
+       memory_object_t         mem_obj,
+       vm_prot_t               prot);
+extern kern_return_t vnode_pager_last_unmap(
        memory_object_t         mem_obj);
 extern void vnode_pager_deallocate(
        memory_object_t);
@@ -248,6 +253,9 @@ extern void vnode_pager_vrele(
        struct vnode *vp);
 extern void vnode_pager_release_from_cache(
        int     *);
+extern int  ubc_map(
+       struct vnode *vp,
+       int flags);
 extern void ubc_unmap(
        struct vnode *vp);
 
@@ -282,7 +290,9 @@ extern kern_return_t dp_memory_object_synchronize(memory_object_t,
                                                  memory_object_offset_t,
                                                  vm_size_t,
                                                  vm_sync_t);
-extern kern_return_t dp_memory_object_unmap(memory_object_t);
+extern kern_return_t dp_memory_object_map(memory_object_t,
+                                         vm_prot_t);
+extern kern_return_t dp_memory_object_last_unmap(memory_object_t);
 #endif /* _memory_object_server_ */
 #ifndef _memory_object_default_server_
 extern kern_return_t default_pager_memory_object_create(
@@ -321,7 +331,8 @@ extern kern_return_t device_pager_synchronize(memory_object_t,
                                              memory_object_offset_t,
                                              vm_size_t,
                                              vm_sync_t);
-extern kern_return_t device_pager_unmap(memory_object_t);
+extern kern_return_t device_pager_map(memory_object_t, vm_prot_t);
+extern kern_return_t device_pager_last_unmap(memory_object_t);
 extern kern_return_t device_pager_populate_object(
        memory_object_t         device,
        memory_object_offset_t  offset,
@@ -347,7 +358,7 @@ extern int macx_swapinfo(
        boolean_t               *encrypted_p);
 
 extern void log_stack_execution_failure(addr64_t vaddr, vm_prot_t prot);
-extern int cs_invalid_page(void);
+extern int cs_invalid_page(addr64_t vaddr);
 extern boolean_t cs_validate_page(void *blobs,
                                  memory_object_offset_t offset, 
                                  const void *data,