xnu-792.6.22.tar.gz

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

diff --git a/osfmk/vm/vm_fault.h b/osfmk/vm/vm_fault.h
index 8c9bd88f54e0ace06a73b96c50a9b593f9e13250..4941efe69d3332d80f83e73d24baf0aa24b92ad6 100644 (file)
--- a/osfmk/vm/vm_fault.h
+++ b/osfmk/vm/vm_fault.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2004 Apple Computer, Inc. All rights reserved.
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
@@ -58,16 +58,17 @@
 #ifndef        _VM_VM_FAULT_H_
 #define _VM_VM_FAULT_H_
 
+#include <mach/mach_types.h>
 #include <mach/kern_return.h>
 #include <mach/boolean.h>
 #include <mach/vm_prot.h>
 #include <mach/vm_param.h>
 #include <mach/vm_behavior.h>
-#include <vm/vm_page.h>
-#include <vm/vm_object.h>
-#include <vm/vm_map.h>
+
+#ifdef KERNEL_PRIVATE
 
 typedef        kern_return_t   vm_fault_return_t;
+
 #define VM_FAULT_SUCCESS               0
 #define VM_FAULT_RETRY                 1
 #define VM_FAULT_INTERRUPTED           2
@@ -75,6 +76,25 @@ typedef      kern_return_t   vm_fault_return_t;
 #define VM_FAULT_FICTITIOUS_SHORTAGE   4
 #define VM_FAULT_MEMORY_ERROR          5
 
+/*
+ *     Page fault handling based on vm_map (or entries therein)
+ */
+
+extern kern_return_t vm_fault(
+               vm_map_t        map,
+               vm_map_offset_t vaddr,
+               vm_prot_t       fault_type,
+               boolean_t       change_wiring,
+               int             interruptible,
+               pmap_t          pmap,
+               vm_map_offset_t pmap_addr);
+
+#ifdef MACH_KERNEL_PRIVATE
+
+#include <vm/vm_page.h>
+#include <vm/vm_object.h>
+#include <vm/vm_map.h>
+
 extern void vm_fault_init(void);
 
 /*
@@ -88,8 +108,8 @@ extern vm_fault_return_t vm_fault_page(
                vm_prot_t       fault_type,     /* What access is requested */
                boolean_t       must_be_resident,/* Must page be resident? */
                int             interruptible,/* how may fault be interrupted */
-               vm_object_offset_t lo_offset,   /* Map entry start */
-               vm_object_offset_t hi_offset,   /* Map entry end */
+               vm_map_offset_t lo_offset,      /* Map entry start */
+               vm_map_offset_t hi_offset,      /* Map entry end */
                vm_behavior_t   behavior,       /* Expected paging behavior */
                /* Modifies in place: */
                vm_prot_t       *protection,    /* Protection for mapping */
@@ -104,45 +124,37 @@ extern vm_fault_return_t vm_fault_page(
                boolean_t       no_zero_fill,   /* don't fill absent pages */
                boolean_t       data_supply,    /* treat as data_supply */
                vm_map_t        map,
-               vm_offset_t     vaddr);
+               vm_map_offset_t vaddr);
 
 extern void vm_fault_cleanup(
                vm_object_t     object,
                vm_page_t       top_page);
-/*
- *     Page fault handling based on vm_map (or entries therein)
- */
-
-extern kern_return_t vm_fault(
-               vm_map_t        map,
-               vm_offset_t     vaddr,
-               vm_prot_t       fault_type,
-               boolean_t       change_wiring,
-               int             interruptible,
-               pmap_t          pmap,
-               vm_offset_t     pmap_addr);
 
 extern kern_return_t vm_fault_wire(
                vm_map_t        map,
                vm_map_entry_t  entry,
                pmap_t          pmap,
-               vm_offset_t     pmap_addr);
+               vm_map_offset_t pmap_addr);
 
 extern void vm_fault_unwire(
                vm_map_t        map,
                vm_map_entry_t  entry,
                boolean_t       deallocate,
                pmap_t          pmap,
-               vm_offset_t     pmap_addr);
+               vm_map_offset_t pmap_addr);
 
 extern kern_return_t   vm_fault_copy(
                vm_object_t             src_object,
                vm_object_offset_t      src_offset,
-               vm_size_t               *src_size,      /* INOUT */
+               vm_map_size_t           *copy_size,     /* INOUT */
                vm_object_t             dst_object,
                vm_object_offset_t      dst_offset,
                vm_map_t                dst_map,
                vm_map_version_t         *dst_version,
                int                     interruptible);
 
+#endif /* MACH_KERNEL_PRIVATE */
+
+#endif /* KERNEL_PRIVATE */
+
 #endif /* _VM_VM_FAULT_H_ */