From owner-p4-projects@FreeBSD.ORG  Thu May 29 19:46:04 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 9683937B404; Thu, 29 May 2003 19:46:03 -0700 (PDT)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 3693837B401
	for <perforce@freebsd.org>; Thu, 29 May 2003 19:46:03 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id D45B443FA3
	for <perforce@freebsd.org>; Thu, 29 May 2003 19:46:02 -0700 (PDT)
	(envelope-from marcel@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h4U2k20U088026
	for <perforce@freebsd.org>; Thu, 29 May 2003 19:46:02 -0700 (PDT)
	(envelope-from marcel@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h4U2k2pN088023
	for perforce@freebsd.org; Thu, 29 May 2003 19:46:02 -0700 (PDT)
Date: Thu, 29 May 2003 19:46:02 -0700 (PDT)
Message-Id: <200305300246.h4U2k2pN088023@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	marcel@freebsd.org using -f
From: Marcel Moolenaar <marcel@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 32091 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 30 May 2003 02:46:05 -0000

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

Change 32091 by marcel@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,