From owner-p4-projects@FreeBSD.ORG  Thu Mar 17 23:25:36 2005
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id DF0C016A4D0; Thu, 17 Mar 2005 23:25:35 +0000 (GMT)
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 B8E8116A4CE
	for <perforce@freebsd.org>; Thu, 17 Mar 2005 23:25:35 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 9B66543D48
	for <perforce@freebsd.org>; Thu, 17 Mar 2005 23:25:35 +0000 (GMT)
	(envelope-from jmg@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j2HNPZUu025273
	for <perforce@freebsd.org>; Thu, 17 Mar 2005 23:25:35 GMT
	(envelope-from jmg@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j2HNPZew025270
	for perforce@freebsd.org; Thu, 17 Mar 2005 23:25:35 GMT
	(envelope-from jmg@freebsd.org)
Date: Thu, 17 Mar 2005 23:25:35 GMT
Message-Id: <200503172325.j2HNPZew025270@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jmg@freebsd.org using -f
From: John-Mark Gurney <jmg@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 73407 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: Thu, 17 Mar 2005 23:25:36 -0000

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

Change 73407 by jmg@jmg_carbon on 2005/03/17 23:24:35

	pull in pmap.c v1.26..

Affected files ...

.. //depot/projects/arm/src/sys/arm/arm/pmap.c#6 integrate

Differences ...

==== //depot/projects/arm/src/sys/arm/arm/pmap.c#6 (text+ko) ====

@@ -147,7 +147,7 @@
 #include "opt_vm.h"
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.25 2005/03/06 21:10:31 cognet Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.26 2005/03/16 23:56:29 cognet Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
@@ -2896,7 +2896,16 @@
 	return (sva);
 }
 
+static void
+pmap_wb_page(vm_page_t m)
+{
+	struct pv_entry *pv;
 
+	TAILQ_FOREACH(pv, &m->md.pv_list, pv_list)
+		pmap_dcache_wb_range(pv->pv_pmap, pv->pv_va, PAGE_SIZE, FALSE,
+		    (pv->pv_flags & PVF_WRITE) == 0);
+}
+
 /*
  * Add a list of wired pages to the kva
  * this routine is only used for temporary
@@ -2911,11 +2920,11 @@
 	int i;
 
 	for (i = 0; i < count; i++) {
+		pmap_wb_page(m[i]);
 		pmap_kenter_internal(va, VM_PAGE_TO_PHYS(m[i]), 
 		    KENTER_CACHE);
 		va += PAGE_SIZE;
 	}
-	cpu_dcache_wbinv_all(); /* XXX: shouldn't be needed */
 }