From owner-p4-projects@FreeBSD.ORG  Tue Feb 26 14:16:00 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 4740F1065674; Tue, 26 Feb 2008 14:16:00 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 0769B1065671
	for <perforce@freebsd.org>; Tue, 26 Feb 2008 14:16:00 +0000 (UTC)
	(envelope-from rrs@cisco.com)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id F06A113C45B
	for <perforce@freebsd.org>; Tue, 26 Feb 2008 14:15:59 +0000 (UTC)
	(envelope-from rrs@cisco.com)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1QEFxmM046279
	for <perforce@freebsd.org>; Tue, 26 Feb 2008 14:15:59 GMT
	(envelope-from rrs@cisco.com)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1QEFxLw046276
	for perforce@freebsd.org; Tue, 26 Feb 2008 14:15:59 GMT
	(envelope-from rrs@cisco.com)
Date: Tue, 26 Feb 2008 14:15:59 GMT
Message-Id: <200802261415.m1QEFxLw046276@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	rrs@cisco.com using -f
From: "Randall R. Stewart" <rrs@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 136241 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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: Tue, 26 Feb 2008 14:16:00 -0000

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

Change 136241 by rrs@rrs-mips2-jnpr on 2008/02/26 14:15:13

	Changes needed to make it compile with the new
	       argument in pmap_enter. We ignore this arg for now.

Affected files ...

.. //depot/projects/mips2-jnpr/src/sys/mips/mips/pmap.c#23 edit

Differences ...

==== //depot/projects/mips2-jnpr/src/sys/mips/mips/pmap.c#23 (text+ko) ====

@@ -1690,7 +1690,7 @@
  *	insert this page into the given map NOW.
  */
 void
-pmap_enter(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_prot_t prot,
+pmap_enter(pmap_t pmap, vm_offset_t va, vm_prot_t fault_type, vm_page_t m, vm_prot_t prot,
     boolean_t wired)
 {
 	vm_offset_t pa, opa;
@@ -2074,7 +2074,12 @@
 	psize = atop(end - start);
 	m = m_start;
 	while (m != NULL && (diff = m->pindex - m_start->pindex) < psize) {
-		pmap_enter(pmap, start + ptoa(diff), m, prot &
+	        /* FIX ME FIX ME - prot is passed in both the
+		 * the normal spot m, prot but also as the fault_type
+		 * which we don't use. If we ever use it in pmap_enter
+		 * we will have to fix this.
+	         */
+		pmap_enter(pmap, start + ptoa(diff), prot, m, prot &
 		    (VM_PROT_READ | VM_PROT_EXECUTE), FALSE);
 		m = TAILQ_NEXT(m, listq);
 	}