--- xnu/xnu-792.6.56/iokit/Kernel/IOMapper.cpp
+++ xnu/xnu-517/iokit/Kernel/IOMapper.cpp
@@ -1,7 +1,9 @@
 /*
- * Copyright (c) 1998-2004 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 1998-2003 Apple Computer, Inc. All rights reserved.
  *
  * @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
@@ -172,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,
@@ -213,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);