--- xnu/xnu-792.21.3/iokit/Kernel/IOMapper.cpp
+++ xnu/xnu-517/iokit/Kernel/IOMapper.cpp
@@ -1,19 +1,16 @@
 /*
- * Copyright (c) 1998-2004 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 1998-2003 Apple Computer, Inc. All rights reserved.
  *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * @APPLE_LICENSE_HEADER_START@
+ * 
+ * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
  * 
  * 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.
+ * 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
@@ -23,7 +20,7 @@
  * Please see the License for the specific language governing rights and
  * limitations under the License.
  * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ * @APPLE_LICENSE_HEADER_END@
  */
 #include <IOKit/IOLib.h>
 #include <IOKit/IOMapper.h>
@@ -177,7 +174,7 @@
         vm_size_t iopl_size = size;
 
         kr = vm_map_get_upl(kernel_map,
-                            (vm_map_offset_t)startUpl,
+                            startUpl,
                             &iopl_size,
                             &iopl,
                             0,
@@ -218,10 +215,8 @@
     ARTTableData *dataP = getARTDataP(artHandle);
 
     int numupls = ((artHandle->getLength() - sizeof(*dataP)) / sizeof(upl_t));
-    for (int i = 0; i < numupls; i++) {
-        upl_abort(dataP->u[i], 0);
-        upl_deallocate(dataP->u[i]);
-    }
+    for (int i = 0; i < numupls; i++)
+        kernel_upl_abort(dataP->u[i], 0);
 
     if (dataP->v) {
         size = round_page_32(size);