Complete the initial set of VM changes required to support full

64-bit file sizes. This step simply addresses the remaining overflows,
and does attempt to optimise performance. The details are:

 o Use a 64-bit type for the vm_object `size' and the size argument
   to vm_object_allocate().
 o Use the correct type for index variables in dev_pager_getpages(),
   vm_object_page_clean() and vm_object_page_remove().
 o Avoid an overflow in the i386 pmap_object_init_pt().

1 files changed, 4 insertions, 4 deletions

diff --git a/sys/vm/vm_object.c b/sys/vm/vm_object.c
index b07d6b8..33b597b 100644
--- a/sys/vm/vm_object.c
+++ b/sys/vm/vm_object.c
@@ -187,7 +187,7 @@ vm_object_zinit(void *mem, int size)
 }
 
 void
-_vm_object_allocate(objtype_t type, vm_size_t size, vm_object_t object)
+_vm_object_allocate(objtype_t type, vm_pindex_t size, vm_object_t object)
 {
 	static int object_hash_rand;
 	int exp, incr;
@@ -341,7 +341,7 @@ vm_object_pip_wait(vm_object_t object, char *waitid)
  *	Returns a new object with the given size.
  */
 vm_object_t
-vm_object_allocate(objtype_t type, vm_size_t size)
+vm_object_allocate(objtype_t type, vm_pindex_t size)
 {
 	vm_object_t result;
 
@@ -626,7 +626,7 @@ void
 vm_object_page_clean(vm_object_t object, vm_pindex_t start, vm_pindex_t end, int flags)
 {
 	vm_page_t p, np;
-	vm_offset_t tstart, tend;
+	vm_pindex_t tstart, tend;
 	vm_pindex_t pi;
 	struct vnode *vp;
 	int clearobjflags;
@@ -1697,7 +1697,7 @@ void
 vm_object_page_remove(vm_object_t object, vm_pindex_t start, vm_pindex_t end, boolean_t clean_only)
 {
 	vm_page_t p, next;
-	unsigned int size;
+	vm_pindex_t size;
 	int all;
 
 	if (object == NULL)