xnu-4903.270.47.tar.gz

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

diff --git a/osfmk/vm/cpm.h b/osfmk/vm/cpm.h
index 9233e644f0575a5187dc9fecc33486267afa9b06..cb011a8bd654797e65e866e96970dc918a52491c 100644 (file)
--- a/osfmk/vm/cpm.h
+++ b/osfmk/vm/cpm.h
@@ -2,7 +2,7 @@
  * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * Copyright (c) 2000 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


@@ -11,10 +11,10 @@
  * 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.
  * 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.
  * 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
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * The Original Code and all software distributed under the License are
  * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,


@@ -22,16 +22,16 @@
  * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
  * Please see the License for the specific language governing rights and
  * limitations under the License.
  * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
  * Please see the License for the specific language governing rights and
  * limitations under the License.

- * 
+ *

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

- * 
+ *

  */
 
  */
 

-#ifndef        _VM_CPM_H_
-#define        _VM_CPM_H_
+#ifndef _VM_CPM_H_
+#define _VM_CPM_H_

 
 /*
  *     File:   vm/cpm.h
 
 /*
  *     File:   vm/cpm.h


@@ -41,7 +41,6 @@
  *     Contiguous physical memory allocator.
  */
 
  *     Contiguous physical memory allocator.
  */
 

-#include <mach_kdb.h>

 #include <mach_counters.h>
 
 #include <mach/mach_types.h>
 #include <mach_counters.h>
 
 #include <mach/mach_types.h>


@@ -56,14 +55,4 @@
 extern kern_return_t
 cpm_allocate(vm_size_t size, vm_page_t *list, ppnum_t max_pnum, ppnum_t pnum_mask, boolean_t wire, int flags);
 
 extern kern_return_t
 cpm_allocate(vm_size_t size, vm_page_t *list, ppnum_t max_pnum, ppnum_t pnum_mask, boolean_t wire, int flags);
 

-/*
- *     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 */
-
-#endif /* _VM_CPM_H_ */
+#endif  /* _VM_CPM_H_ */