X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/43866e378188c25dd1e2208016ab3cbeb086ae6c..5eebf7385fedb1517b66b53c28e5aa6bb0a2be50:/osfmk/kern/syscall_emulation.c?ds=inline diff --git a/osfmk/kern/syscall_emulation.c b/osfmk/kern/syscall_emulation.c index fc7c02b81..ff83b177d 100644 --- a/osfmk/kern/syscall_emulation.c +++ b/osfmk/kern/syscall_emulation.c @@ -3,22 +3,19 @@ * * @APPLE_LICENSE_HEADER_START@ * - * Copyright (c) 1999-2003 Apple Computer, Inc. All Rights Reserved. + * 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. * - * 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 + * This 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. + * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT. Please see the + * License for the specific language governing rights and limitations + * under the License. * * @APPLE_LICENSE_HEADER_END@ */ @@ -377,10 +374,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); @@ -447,7 +444,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; @@ -484,7 +481,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,