xnu-344.21.73.tar.gz

[apple/xnu.git] / osfmk / kern / syscall_emulation.c

diff --git a/osfmk/kern/syscall_emulation.c b/osfmk/kern/syscall_emulation.c
index 843dd5a1ebef479c0834aed31fc9b8456f1f660d..308e3ef7cb6d51897650de67b51c6ff5d11fbdb2 100644 (file)
--- a/osfmk/kern/syscall_emulation.c
+++ b/osfmk/kern/syscall_emulation.c
@@ -3,19 +3,22 @@
  *
  * @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,
- * 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@
  */
@@ -374,10 +377,10 @@ task_set_emulation_vector(
         *      Can't fault while we hold locks.
         */
        kr = vm_map_wire(ipc_kernel_map,
-                            trunc_page(emul_vector_addr),
-                            round_page(emul_vector_addr +
-                                       emulation_vector_count *
-                                       sizeof(eml_dispatch_t)),
+                            trunc_page_32(emul_vector_addr),
+                            round_page_32(emul_vector_addr +
+                                          emulation_vector_count *
+                                          sizeof(eml_dispatch_t)),
                             VM_PROT_READ|VM_PROT_WRITE, FALSE);
        assert(kr == KERN_SUCCESS);
 
@@ -444,7 +447,7 @@ task_get_emulation_vector(
             */
            vector_size = eml->disp_count * sizeof(vm_offset_t);
 
-           size_needed = round_page(vector_size);
+           size_needed = round_page_32(vector_size);
            if (size_needed <= size)
                break;
 
@@ -481,7 +484,7 @@ task_get_emulation_vector(
        /*
         * Free any unused memory beyond the end of the last page used
         */
-       size_used = round_page(vector_size);
+       size_used = round_page_32(vector_size);
        if (size_used != size)
            (void) kmem_free(ipc_kernel_map,
                             addr + size_used,