xnu-1228.0.2.tar.gz

[apple/xnu.git] / osfmk / vm / vm_debug.c

diff --git a/osfmk/vm/vm_debug.c b/osfmk/vm/vm_debug.c
index 4d703002cc35c45dd6299b554e44e98432b77ff0..702ce6a4214b098529f9164c6464334e0a0172d0 100644 (file)
--- a/osfmk/vm/vm_debug.c
+++ b/osfmk/vm/vm_debug.c
@@ -1,31 +1,29 @@
 /*
  * Copyright (c) 2000-2004 Apple Computer, Inc. All rights reserved.
  *
 /*
  * Copyright (c) 2000-2004 Apple Computer, Inc. All rights reserved.
  *

- * @APPLE_LICENSE_OSREFERENCE_HEADER_START@
+ * @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 
- * 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 
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES, 
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY, 
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT. 
- * Please see the License for the specific language governing rights and 
+ * 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. 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
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * 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.
  * limitations under the License.

- *
- * @APPLE_LICENSE_OSREFERENCE_HEADER_END@
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@

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


@@ -209,8 +207,6 @@ mach_vm_region_info(
                                        cobject->ref_count;
                                vio->vio_resident_page_count =
                                        cobject->resident_page_count;
                                        cobject->ref_count;
                                vio->vio_resident_page_count =
                                        cobject->resident_page_count;

-                               vio->vio_absent_count =
-                                       cobject->absent_count;

                                vio->vio_copy =
                                        (vm_offset_t) cobject->copy;
                                vio->vio_shadow =
                                vio->vio_copy =
                                        (vm_offset_t) cobject->copy;
                                vio->vio_shadow =


@@ -240,10 +236,10 @@ mach_vm_region_info(
                                vio->vio_alive =
                                        cobject->alive;
                                vio->vio_purgable =
                                vio->vio_alive =
                                        cobject->alive;
                                vio->vio_purgable =

-                                       (cobject->purgable != VM_OBJECT_NONPURGABLE);
+                                       (cobject->purgable != VM_PURGABLE_DENY);

                                vio->vio_purgable_volatile =
                                vio->vio_purgable_volatile =

-                                       (cobject->purgable == VM_OBJECT_PURGABLE_VOLATILE ||
-                                        cobject->purgable == VM_OBJECT_PURGABLE_EMPTY);
+                                       (cobject->purgable == VM_PURGABLE_VOLATILE ||
+                                        cobject->purgable == VM_PURGABLE_EMPTY);

                        }
 
                        used++;
                        }
 
                        used++;


@@ -412,8 +408,6 @@ mach_vm_region_info_64(
                                        cobject->ref_count;
                                vio->vio_resident_page_count =
                                        cobject->resident_page_count;
                                        cobject->ref_count;
                                vio->vio_resident_page_count =
                                        cobject->resident_page_count;

-                               vio->vio_absent_count =
-                                       cobject->absent_count;

                                vio->vio_copy =
                                        (vm_offset_t) cobject->copy;
                                vio->vio_shadow =
                                vio->vio_copy =
                                        (vm_offset_t) cobject->copy;
                                vio->vio_shadow =


@@ -443,10 +437,10 @@ mach_vm_region_info_64(
                                vio->vio_alive =
                                        cobject->alive;
                                vio->vio_purgable =
                                vio->vio_alive =
                                        cobject->alive;
                                vio->vio_purgable =

-                                       (cobject->purgable != VM_OBJECT_NONPURGABLE);
+                                       (cobject->purgable != VM_PURGABLE_DENY);

                                vio->vio_purgable_volatile =
                                vio->vio_purgable_volatile =

-                                       (cobject->purgable == VM_OBJECT_PURGABLE_VOLATILE ||
-                                        cobject->purgable == VM_OBJECT_PURGABLE_EMPTY);
+                                       (cobject->purgable == VM_PURGABLE_VOLATILE ||
+                                        cobject->purgable == VM_PURGABLE_EMPTY);

                        }
 
                        used++;
                        }
 
                        used++;