From owner-p4-projects  Sat Apr 13 12:45:43 2002
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id A41BE37B404; Sat, 13 Apr 2002 12:45:38 -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 E043F37B400
	for <perforce@freebsd.org>; Sat, 13 Apr 2002 12:45:37 -0700 (PDT)
Received: (from perforce@localhost)
	by freefall.freebsd.org (8.11.6/8.11.6) id g3DJjbQ70016
	for perforce@freebsd.org; Sat, 13 Apr 2002 12:45:37 -0700 (PDT)
	(envelope-from tmm@freebsd.org)
Date: Sat, 13 Apr 2002 12:45:37 -0700 (PDT)
Message-Id: <200204131945.g3DJjbQ70016@freefall.freebsd.org>
X-Authentication-Warning: freefall.freebsd.org: perforce set sender to tmm@freebsd.org using -f
From: Thomas Moestl <tmm@FreeBSD.org>
Subject: PERFORCE change 9665 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=9665

Change 9665 by tmm@tmm_sparc64 on 2002/04/13 12:45:19

	The CVS version still uses the old (and more correct) pmap_extract()
	code to get the physical address, so reduce unnecessary diffs to
	it.

Affected files ...

... //depot/projects/sparc64/sys/sparc64/sparc64/vm_machdep.c#51 edit

Differences ...

==== //depot/projects/sparc64/sys/sparc64/sparc64/vm_machdep.c#51 (text+ko) ====

@@ -338,14 +338,16 @@
 {
 	vm_prot_t prot;
 	caddr_t addr, kva;
+	vm_offset_t pa;
 	int pidx;
 	struct vm_page *m;
-	vm_offset_t phys;
+	pmap_t pmap;
 
 	GIANT_REQUIRED;
 
 	KASSERT((bp->b_flags & B_PHYS) != 0, ("vmapbuf: not a B_PHYS buffer"));
 
+	pmap = &curproc->p_vmspace->vm_pmap;
 	/*
 	 * Use the d-cache color of b->b_data (the user space region) for the
 	 * kva region too, to avoid illegal cache aliases which would require
@@ -368,10 +370,9 @@
 		 */
 		vm_fault_quick((addr >= (caddr_t)bp->b_saveaddr) ?
 		    addr : bp->b_saveaddr, prot);
-		phys = pmap_extract(&curproc->p_vmspace->vm_pmap,
-		    (vm_offset_t)addr);
-		KASSERT(phys != 0, ("vmapbuf: page not present"));
-		m = PHYS_TO_VM_PAGE(phys);
+		pa = pmap_extract(pmap, (vm_offset_t)addr);
+		KASSERT(pa != 0, ("vmapbuf: page not present"));
+		m = PHYS_TO_VM_PAGE(pa);
 		vm_page_hold(m);
 		bp->b_pages[pidx] = m;
 		pmap_enter(kernel_pmap, (vm_offset_t)kva, m,

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