PERFORCE change 32091 for review

[Marcel Moolenaar]

http://perforce.freebsd.org/chv.cgi?CH=32091

Change 32091 by marcel at marcel_nfs on 2003/05/29 19:45:09

	Fix ia32 support on ia64. Initialize the start address
	given to vm_map_find. Previously we were lucky. We're
	not now apparently.

Affected files ...

.. //depot/projects/ia64/sys/kern/imgact_elf.c#30 edit

Differences ...

==== //depot/projects/ia64/sys/kern/imgact_elf.c#30 (text+ko) ====

@@ -274,7 +274,9 @@
 	vm_offset_t start, vm_offset_t end, vm_prot_t prot,
 	vm_prot_t max, int cow)
 {
-	int rv;
+	vm_offset_t data_buf, off;
+	vm_size_t sz;
+	int error, rv;
 
 	if (start != trunc_page(start)) {
 		rv = __elfN(map_partial)(map, object, offset, start,
@@ -293,10 +295,6 @@
 	}
 	if (end > start) {
 		if (offset & PAGE_MASK) {
-			vm_offset_t data_buf, off;
-			vm_size_t sz;
-			int error;
-
 			/*
 			 * The mapping is not page aligned. This means we have
 			 * to copy the data. Sigh.
@@ -305,6 +303,7 @@
 			    FALSE, prot, max, 0);
 			if (rv)
 				return (rv);
+			data_buf = 0;
 			while (start < end) {
 				vm_object_reference(object);
 				rv = vm_map_find(exec_map,