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, 3 insertions, 3 deletions

diff --git a/sys/vm/vm_object.h b/sys/vm/vm_object.h
index 53db319..65e32af 100644
--- a/sys/vm/vm_object.h
+++ b/sys/vm/vm_object.h
@@ -93,7 +93,7 @@ struct vm_object {
 	TAILQ_ENTRY(vm_object) shadow_list; /* chain of shadow objects */
 	TAILQ_HEAD(, vm_page) memq;	/* list of resident pages */
 	int generation;			/* generation ID */
-	vm_size_t size;			/* Object size */
+	vm_pindex_t size;		/* Object size */
 	int ref_count;			/* How many refs?? */
 	int shadow_count;		/* how many objects that this is a shadow for */
 	int hash_rand;			/* (c) hash table randomizer */
@@ -182,8 +182,8 @@ void vm_object_pip_wakeupn(vm_object_t object, short i);
 void vm_object_pip_sleep(vm_object_t object, char *waitid);
 void vm_object_pip_wait(vm_object_t object, char *waitid);
 
-vm_object_t vm_object_allocate (objtype_t, vm_size_t);
-void _vm_object_allocate (objtype_t, vm_size_t, vm_object_t);
+vm_object_t vm_object_allocate (objtype_t, vm_pindex_t);
+void _vm_object_allocate (objtype_t, vm_pindex_t, vm_object_t);
 boolean_t vm_object_coalesce (vm_object_t, vm_pindex_t, vm_size_t, vm_size_t);
 void vm_object_collapse (vm_object_t);
 void vm_object_deallocate (vm_object_t);