xnu-517.tar.gz

[apple/xnu.git] / osfmk / ipc / mach_debug.c

diff --git a/osfmk/ipc/mach_debug.c b/osfmk/ipc/mach_debug.c
index 7fe99ea813081cb65d9a6309bf24f62c340372f8..ead49e1bcb93be27f056b323d7af0557135aa19a 100644 (file)
--- a/osfmk/ipc/mach_debug.c
+++ b/osfmk/ipc/mach_debug.c
@@ -3,19 +3,22 @@
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
  *
  * @APPLE_LICENSE_HEADER_START@
  * 

- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
+ * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.

  * 
  * 

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

- * FITNESS FOR A PARTICULAR PURPOSE 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_LICENSE_HEADER_END@
  */
  * 
  * @APPLE_LICENSE_HEADER_END@
  */


@@ -167,7 +170,7 @@ host_ipc_hash_info(
                if (info != *infop)
                        kmem_free(ipc_kernel_map, addr, size);
 
                if (info != *infop)
                        kmem_free(ipc_kernel_map, addr, size);
 

-               size = round_page(actual * sizeof *info);
+               size = round_page_32(actual * sizeof *info);

                kr = kmem_alloc_pageable(ipc_kernel_map, &addr, size);
                if (kr != KERN_SUCCESS)
                        return KERN_RESOURCE_SHORTAGE;
                kr = kmem_alloc_pageable(ipc_kernel_map, &addr, size);
                if (kr != KERN_SUCCESS)
                        return KERN_RESOURCE_SHORTAGE;


@@ -188,7 +191,7 @@ host_ipc_hash_info(
                vm_map_copy_t copy;
                vm_size_t used;
 
                vm_map_copy_t copy;
                vm_size_t used;
 

-               used = round_page(actual * sizeof *info);
+               used = round_page_32(actual * sizeof *info);

 
                if (used != size)
                        kmem_free(ipc_kernel_map, addr + used, size - used);
 
                if (used != size)
                        kmem_free(ipc_kernel_map, addr + used, size - used);


@@ -282,7 +285,7 @@ mach_port_space_info(
                                kmem_free(ipc_kernel_map,
                                          table_addr, table_size);
 
                                kmem_free(ipc_kernel_map,
                                          table_addr, table_size);
 

-                       table_size = round_page(table_actual *
+                       table_size = round_page_32(table_actual *

                                                sizeof *table_info);
                        kr = kmem_alloc(ipc_kernel_map,
                                        &table_addr, table_size);
                                                sizeof *table_info);
                        kr = kmem_alloc(ipc_kernel_map,
                                        &table_addr, table_size);


@@ -303,7 +306,7 @@ mach_port_space_info(
                                kmem_free(ipc_kernel_map,
                                          tree_addr, tree_size);
 
                                kmem_free(ipc_kernel_map,
                                          tree_addr, tree_size);
 

-                       tree_size = round_page(tree_actual *
+                       tree_size = round_page_32(tree_actual *

                                               sizeof *tree_info);
                        kr = kmem_alloc(ipc_kernel_map,
                                        &tree_addr, tree_size);
                                               sizeof *tree_info);
                        kr = kmem_alloc(ipc_kernel_map,
                                        &tree_addr, tree_size);


@@ -393,7 +396,7 @@ mach_port_space_info(
                /* kmem_alloc doesn't zero memory */
 
                size_used = table_actual * sizeof *table_info;
                /* kmem_alloc doesn't zero memory */
 
                size_used = table_actual * sizeof *table_info;

-               rsize_used = round_page(size_used);
+               rsize_used = round_page_32(size_used);

 
                if (rsize_used != table_size)
                        kmem_free(ipc_kernel_map,
 
                if (rsize_used != table_size)
                        kmem_free(ipc_kernel_map,


@@ -431,7 +434,7 @@ mach_port_space_info(
                /* kmem_alloc doesn't zero memory */
 
                size_used = tree_actual * sizeof *tree_info;
                /* kmem_alloc doesn't zero memory */
 
                size_used = tree_actual * sizeof *tree_info;

-               rsize_used = round_page(size_used);
+               rsize_used = round_page_32(size_used);

 
                if (rsize_used != tree_size)
                        kmem_free(ipc_kernel_map,
 
                if (rsize_used != tree_size)
                        kmem_free(ipc_kernel_map,