xnu-792.6.56.tar.gz

[apple/xnu.git] / osfmk / kern / kalloc.h

diff --git a/osfmk/kern/kalloc.h b/osfmk/kern/kalloc.h
index 2baeb5a72da8716fcbc80e70831c2a212bd592bb..fefa9f69fbc6708669b97b94c0f335b7e748cd1a 100644 (file)
--- a/osfmk/kern/kalloc.h
+++ b/osfmk/kern/kalloc.h
@@ -1,10 +1,8 @@
 /*
 /*

- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2005 Apple Computer, Inc. All rights reserved.

  *
  * @APPLE_LICENSE_HEADER_START@
  * 
  *
  * @APPLE_LICENSE_HEADER_START@
  * 

- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
- * 

  * This file contains Original Code and/or Modifications of Original Code
  * as defined in and that are subject to the Apple Public Source License
  * Version 2.0 (the 'License'). You may not use this file except in
  * This file contains Original Code and/or Modifications of Original Code
  * as defined in and that are subject to the Apple Public Source License
  * Version 2.0 (the 'License'). You may not use this file except in


@@ -51,43 +49,53 @@
  * the rights to redistribute these changes.
  */
 
  * the rights to redistribute these changes.
  */
 

+#ifdef KERNEL_PRIVATE
+

 #ifndef        _KERN_KALLOC_H_
 #define _KERN_KALLOC_H_
 
 #include <mach/machine/vm_types.h>
 #ifndef        _KERN_KALLOC_H_
 #define _KERN_KALLOC_H_
 
 #include <mach/machine/vm_types.h>

+#include <sys/cdefs.h>

 
 

-#define KALLOC_MINSIZE         16
+__BEGIN_DECLS

 
 

-extern vm_offset_t     kalloc(
-                                               vm_size_t       size);
+extern void *kalloc(vm_size_t  size);

 
 

-extern vm_offset_t     kalloc_noblock(
-                                      vm_size_t        size);
+extern void *kalloc_noblock(vm_size_t  size);

 
 

-extern vm_offset_t     kget(
-                                               vm_size_t       size);
+extern void *kget(vm_size_t    size);

 
 

-extern void                    kfree(
-                                               vm_offset_t     data,
-                                               vm_size_t       size);
+extern void kfree(void         *data,
+                 vm_size_t     size);

 
 

-#include <sys/appleapiopts.h>
+__END_DECLS

 
 

-#ifdef __APPLE_API_PRIVATE
+#ifdef MACH_KERNEL_PRIVATE

 
 

-#ifdef MACH_KERNEL_PRIVATE

 #include <kern/lock.h>
 
 #include <kern/lock.h>
 

+#define KALLOC_MINSIZE         16
+

 extern void            kalloc_init(void);
 
 extern void            kalloc_init(void);
 

-extern void            krealloc(
-                                       vm_offset_t     *addrp,
-                                       vm_size_t       old_size,
-                                       vm_size_t       new_size,
-                                       simple_lock_t   lock);
+extern void            krealloc(void           **addrp,
+                                vm_size_t      old_size,
+                                vm_size_t      new_size,
+                                simple_lock_t  lock);
+
+extern void            kalloc_fake_zone_info(
+                               int             *count,
+                               vm_size_t       *cur_size,
+                               vm_size_t       *max_size,
+                               vm_size_t       *elem_size,
+                               vm_size_t       *alloc_size,
+                               int             *collectable,
+                               int             *exhaustable);

 
 

-#endif /* MACH_KERNEL_PRIVATE */
+extern vm_size_t kalloc_max_prerounded;

 
 

-#endif /* __APPLE_APPI_PRIVATE */
+#endif /* MACH_KERNEL_PRIVATE */

 
 #endif /* _KERN_KALLOC_H_ */
 
 #endif /* _KERN_KALLOC_H_ */

+
+#endif /* KERNEL_PRIVATE */