Date: Sat, 13 Apr 2002 19:04:47 -0700 (PDT) From: Jake Burkholder <jake@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 9687 for review Message-ID: <200204140204.g3E24lg49465@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200204140204.g3E24lg49465>