xnu-792.22.5.tar.gz

[apple/xnu.git] / osfmk / vm / vm_external.c

diff --git a/osfmk/vm/vm_external.c b/osfmk/vm/vm_external.c
index f5eca5ba51bd243121554bbba6ec29b74159c527..85712c9a62cbc59cd5d3976f1074e3e59466b074 100644 (file)
--- a/osfmk/vm/vm_external.c
+++ b/osfmk/vm/vm_external.c
@@ -1,23 +1,29 @@
 /*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2004 Apple Computer, Inc. All rights reserved.
  *
- * @APPLE_LICENSE_HEADER_START@
+ * @APPLE_OSREFERENCE_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.
+ * 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.
  * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * 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@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /*
  * @OSF_COPYRIGHT@
@@ -152,7 +158,7 @@ vm_external_destroy(
        } else {
                bytes = power_of_2(bytes);
        }
-       kfree((vm_offset_t)map, bytes);
+       kfree(map, bytes);
 }
 
 /*
@@ -167,12 +173,13 @@ vm_external_map_size(
        vm_size_t       bytes;
 
        bytes = stob(size);
-       if (bytes != 0)
+       if (bytes != 0) {
                if (bytes <= SMALL_SIZE) {
                        bytes = SMALL_SIZE;
                } else {
                        bytes = power_of_2(bytes);
                }
+       }
        return bytes;
 }
 
@@ -232,7 +239,7 @@ _vm_external_state_get(
 
        assert (map != VM_EXTERNAL_NULL);
 
-       bit = atop(offset);
+       bit = atop_32(offset);
        byte = bit >> 3;
        if (map[byte] & (1 << (bit & 07))) {
                return VM_EXTERNAL_STATE_EXISTS;
@@ -252,7 +259,7 @@ vm_external_state_set(
        if (map == VM_EXTERNAL_NULL)
                return;
 
-       bit = atop(offset);
+       bit = atop_32(offset);
        byte = bit >> 3;
        map[byte] |= (1 << (bit & 07));
 }
@@ -268,7 +275,7 @@ vm_external_state_clr(
        if (map == VM_EXTERNAL_NULL)
                return;
 
-       bit = atop(offset);
+       bit = atop_32(offset);
        byte = bit >> 3;
        map[byte] &= ~(1 << (bit & 07));
 }