--- xnu/xnu-1228/libkern/c++/OSData.cpp
+++ xnu/xnu-517/libkern/c++/OSData.cpp
@@ -1,19 +1,16 @@
 /*
  * Copyright (c) 2000 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@
  */
 /* IOData.m created by rsulack on Thu 25-Sep-1997 */
 
@@ -63,7 +60,7 @@
 
     if (data && (!inCapacity || capacity < inCapacity) ) {
         // clean out old data's storage if it isn't big enough
-        kfree(data, capacity);
+        kfree((vm_address_t) data, capacity);
         data = 0;
         ACCUMSIZE(-capacity);
     }
@@ -188,7 +185,7 @@
 void OSData::free()
 {
     if (capacity != EXTERNAL && data && capacity) {
-        kfree(data, capacity);
+        kfree((vm_offset_t)data, capacity);
         ACCUMSIZE( -capacity );
     }
     super::free();
@@ -223,7 +220,7 @@
         bzero(newData + capacity, newCapacity - capacity);
         if (data) {
             bcopy(data, newData, capacity);
-            kfree(data, capacity);
+            kfree((vm_offset_t)data, capacity);
         }
         ACCUMSIZE( newCapacity - capacity );
         data = (void *) newData;