xnu-792.10.96.tar.gz

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

diff --git a/osfmk/vm/vm_kern.h b/osfmk/vm/vm_kern.h
index 247448732dd1d2f4c02054640dc5e74969e6300f..a8bc5ec1122623bac022da801c692127ca81fe48 100644 (file)
--- a/osfmk/vm/vm_kern.h
+++ b/osfmk/vm/vm_kern.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@
  * 
@@ -60,14 +60,11 @@
 #ifndef        _VM_VM_KERN_H_
 #define _VM_VM_KERN_H_
 
+#include <mach/mach_types.h>
 #include <mach/boolean.h>
 #include <mach/kern_return.h>
-#include <mach/machine/vm_types.h>
-#include <vm/vm_map.h>
 
-extern void            kmem_init(
-                               vm_offset_t     start,
-                               vm_offset_t     end);
+#ifdef KERNEL_PRIVATE
 
 extern kern_return_t   kernel_memory_allocate(
                                vm_map_t        map,
@@ -80,6 +77,7 @@ extern kern_return_t  kernel_memory_allocate(
 #define KMA_HERE       0x01
 #define KMA_NOPAGEWAIT 0x02
 #define KMA_KOBJECT    0x04
+#define KMA_LOMEM      0x08
 
 extern kern_return_t kmem_alloc_contig(
                                vm_map_t        map,
@@ -98,11 +96,6 @@ extern kern_return_t kmem_alloc_pageable(
                                vm_offset_t     *addrp,
                                vm_size_t       size);
 
-extern kern_return_t   kmem_alloc_wired(
-                               vm_map_t        map,
-                               vm_offset_t     *addrp,
-                               vm_size_t       size);
-
 extern kern_return_t   kmem_alloc_aligned(
                                vm_map_t        map,
                                vm_offset_t     *addrp,
@@ -120,6 +113,17 @@ extern void                kmem_free(
                                vm_offset_t     addr,
                                vm_size_t       size);
 
+#ifdef MACH_KERNEL_PRIVATE
+
+extern void            kmem_init(
+                                       vm_offset_t     start,
+                                       vm_offset_t     end);
+
+extern kern_return_t   kmem_alloc_wired(
+                               vm_map_t        map,
+                               vm_offset_t     *addrp,
+                               vm_size_t       size);
+
 extern kern_return_t   kmem_suballoc(
                                vm_map_t        parent,
                                vm_offset_t     *addr,
@@ -128,34 +132,31 @@ extern kern_return_t      kmem_suballoc(
                                boolean_t       anywhere,
                                vm_map_t        *new_map);
 
-extern void            kmem_io_object_deallocate(
-                               vm_map_copy_t   copy);
-
-extern kern_return_t   kmem_io_object_trunc(
-                               vm_map_copy_t   copy,
-                               vm_size_t       new_size);
-
-extern boolean_t       copyinmap(
+extern kern_return_t   copyinmap(
                                vm_map_t        map,
-                               vm_offset_t     fromaddr,
-                               vm_offset_t     toaddr,
+                               vm_map_offset_t fromaddr,
+                               void            *todata,
                                vm_size_t       length);
 
-extern boolean_t       copyoutmap(
+extern kern_return_t   copyoutmap(
                                vm_map_t        map,
-                               vm_offset_t     fromaddr,
-                               vm_offset_t     toaddr,
+                               void            *fromdata,
+                               vm_map_offset_t toaddr,
                                vm_size_t       length);
 
 extern kern_return_t   vm_conflict_check(
                                vm_map_t                map,
-                               vm_offset_t             off,
-                               vm_size_t               len,
+                               vm_map_offset_t         off,
+                               vm_map_size_t           len,
                                memory_object_t         pager,
                                vm_object_offset_t      file_off);
 
+#endif /* MACH_KERNEL_PRIVATE */
+
 extern vm_map_t        kernel_map;
 extern vm_map_t        kernel_pageable_map;
 extern vm_map_t ipc_kernel_map;
 
+#endif /* KERNEL_PRIVATE */
+
 #endif /* _VM_VM_KERN_H_ */