xnu-2422.100.13.tar.gz

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

diff --git a/osfmk/vm/cpm.h b/osfmk/vm/cpm.h
index 3c2bb78ded81075dd6cf4689c91968cd6202c8ee..4d4b968d20c7c1c71b50ccf2a9ea8f276c3f136a 100644 (file)
--- a/osfmk/vm/cpm.h
+++ b/osfmk/vm/cpm.h
@@ -1,16 +1,19 @@
 /*
  * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
  *
 /*
  * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
  *

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

  * 
  * 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

- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.

  * 
  * The Original Code and all software distributed under the License are
  * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
  * 
  * The Original Code and all software distributed under the License are
  * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER


@@ -20,7 +23,7 @@
  * Please see the License for the specific language governing rights and
  * limitations under the License.
  * 
  * Please see the License for the specific language governing rights and
  * limitations under the License.
  * 

- * @APPLE_LICENSE_HEADER_END@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@

  */
 /*
  * @OSF_COPYRIGHT@
  */
 /*
  * @OSF_COPYRIGHT@


@@ -38,9 +41,10 @@
  *     Contiguous physical memory allocator.
  */
 
  *     Contiguous physical memory allocator.
  */
 

-#include <mach_kdb.h>

 #include <mach_counters.h>
 
 #include <mach_counters.h>
 

+#include <mach/mach_types.h>
+#include <vm/vm_page.h>

 /*
  *     Return a linked list of physically contiguous
  *     wired pages.  Caller is responsible for disposal
 /*
  *     Return a linked list of physically contiguous
  *     wired pages.  Caller is responsible for disposal


@@ -49,16 +53,6 @@
  *     These pages are all in "gobbled" state when .
  */
 extern kern_return_t
  *     These pages are all in "gobbled" state when .
  */
 extern kern_return_t

-       cpm_allocate(vm_size_t size, vm_page_t *list, boolean_t wire);
-
-/*
- *     CPM-specific event counters.
- */
-#define        VM_CPM_COUNTERS         (MACH_KDB && MACH_COUNTERS && VM_CPM)
-#if    VM_CPM_COUNTERS
-#define        cpm_counter(foo)        foo
-#else  /* VM_CPM_COUNTERS */
-#define        cpm_counter(foo)
-#endif /* VM_CPM_COUNTERS */
+cpm_allocate(vm_size_t size, vm_page_t *list, ppnum_t max_pnum, ppnum_t pnum_mask, boolean_t wire, int flags);

 
 #endif /* _VM_CPM_H_ */
 
 #endif /* _VM_CPM_H_ */