From owner-p4-projects  Sat Apr 13 19: 5: 8 2002
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 9B27C37B419; Sat, 13 Apr 2002 19:04:48 -0700 (PDT)
Delivered-To: perforce@freebsd.org
Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21])
	by hub.freebsd.org (Postfix) with ESMTP id 6511237B405
	for <perforce@freebsd.org>; Sat, 13 Apr 2002 19:04:47 -0700 (PDT)
Received: (from perforce@localhost)
	by freefall.freebsd.org (8.11.6/8.11.6) id g3E24lg49465
	for perforce@freebsd.org; Sat, 13 Apr 2002 19:04:47 -0700 (PDT)
	(envelope-from jake@freebsd.org)
Date: Sat, 13 Apr 2002 19:04:47 -0700 (PDT)
Message-Id: <200204140204.g3E24lg49465@freefall.freebsd.org>
X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jake@freebsd.org using -f
From: Jake Burkholder <jake@FreeBSD.org>
Subject: PERFORCE change 9687 for review
To: Perforce Change Reviews <perforce@freebsd.org>
Sender: owner-p4-projects@FreeBSD.ORG
Precedence: bulk
List-ID: <p4-projects.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20p4-projects>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20p4-projects>
X-Loop: FreeBSD.ORG

http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9687

Change 9687 by jake@jake_sparc64 on 2002/04/13 19:04:44

	Fix mismerge.

Affected files ...

... //depot/projects/sparc64/sys/kern/sys_pipe.c#18 edit

Differences ...

==== //depot/projects/sparc64/sys/kern/sys_pipe.c#18 (text+ko) ====

@@ -602,6 +602,8 @@
 	u_int size;
 	int i, col;
 	vm_offset_t addr, endaddr, kva;
+	vm_offset_t paddr;
+	vm_page_t m;
 
 	GIANT_REQUIRED;
 	PIPE_LOCK_ASSERT(wpipe, MA_NOTOWNED);
@@ -613,7 +615,6 @@
 	endaddr = round_page((vm_offset_t)uio->uio_iov->iov_base + size);
 	addr = trunc_page((vm_offset_t)uio->uio_iov->iov_base);
 	for (i = 0; addr < endaddr; addr += PAGE_SIZE, i++) {
-		map = &curproc->p_vmspace->vm_map;
 		if (vm_fault_quick((caddr_t)addr, VM_PROT_READ) < 0 ||
 		    (paddr = pmap_extract(vmspace_pmap(curproc->p_vmspace),
 		     addr)) == 0) {

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe p4-projects" in the body of the message