X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/8ad349bb6ed4a0be06e34c92be0d98b92e078db4..2dced7af2b695f87fe26496a3e73c219b7880cbc:/osfmk/vm/vm_external.h

diff --git a/osfmk/vm/vm_external.h b/osfmk/vm/vm_external.h
index 27d4e759c..803c9753a 100644
--- a/osfmk/vm/vm_external.h
+++ b/osfmk/vm/vm_external.h
@@ -1,31 +1,29 @@
 /*
  * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
  *
- * @APPLE_LICENSE_OSREFERENCE_HEADER_START@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
- * 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.
- *
- * 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, QUIET ENJOYMENT OR NON-INFRINGEMENT. 
- * Please see the License for the specific language governing rights and 
+ * 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.
+ * 
+ * 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, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
  * limitations under the License.
- *
- * @APPLE_LICENSE_OSREFERENCE_HEADER_END@
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /*
  * @OSF_COPYRIGHT@
@@ -62,6 +60,7 @@
 #define VM_VM_EXTERNAL_H_
 
 #include <mach/boolean.h>
+#include <mach/vm_types.h>
 #include <mach/machine/vm_types.h>
 
 /*
@@ -87,7 +86,7 @@ typedef int	vm_external_state_t;
 /*
  * Useful macros
  */
-#define stob(s)	((atop_32((s)) + 07) >> 3)
+#define stob(s)	((atop_64((s)) + 07) >> 3)
 
 /*
  *	Routines exported by this module.
@@ -98,34 +97,34 @@ extern void			vm_external_module_initialize(void);
 
 extern vm_external_map_t	vm_external_create(
 					/* Create a vm_external_map_t */
-					vm_offset_t		size);
+					vm_object_size_t	size);
 
 extern void			vm_external_destroy(
 					/* Destroy one */
 					vm_external_map_t	map,
-					vm_size_t		size);
+					vm_object_size_t	size);
 
-extern vm_size_t		vm_external_map_size(
+extern vm_object_size_t		vm_external_map_size(
 					/* Return size of map in bytes */
-					vm_offset_t	size);
+					vm_object_size_t	size);
 
 extern void			vm_external_copy(
 					/* Copy one into another */
 					vm_external_map_t	old_map,
-					vm_size_t		old_size,
+					vm_object_size_t	old_size,
 					vm_external_map_t	new_map);
 
 extern void			vm_external_state_set(	
 					/* Set state of a page to
 					 * VM_EXTERNAL_STATE_EXISTS */
 					vm_external_map_t	map,
-					vm_offset_t		offset);
+					vm_object_offset_t	offset);
 
 extern void			vm_external_state_clr(	
 					/* clear page state
 					 */
 					vm_external_map_t	map,
-					vm_offset_t		offset);
+					vm_object_offset_t	offset);
 
 #define	vm_external_state_get(map, offset)			  	\
 			(((map) != VM_EXTERNAL_NULL) ? 			\
@@ -137,11 +136,12 @@ extern void			vm_external_state_clr(
 extern vm_external_state_t	_vm_external_state_get(
 					/* HIDDEN routine */
 					vm_external_map_t	map,
-					vm_offset_t		offset);
+					vm_object_offset_t	offset);
 
 boolean_t			vm_external_within(
 					/* Check if new object size
 					 * fits in current map */
-					vm_size_t	new_size, 
-					vm_size_t	old_size);
+					vm_object_size_t	new_size, 
+					vm_object_size_t	old_size);
+
 #endif	/* VM_VM_EXTERNAL_H_ */