From owner-p4-projects@FreeBSD.ORG  Thu May 22 20:03:40 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id C561537B404; Thu, 22 May 2003 20:03:39 -0700 (PDT)
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 7A1F337B401
	for <perforce@freebsd.org>; Thu, 22 May 2003 20:03:39 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 2372A43F85
	for <perforce@freebsd.org>; Thu, 22 May 2003 20:03:39 -0700 (PDT)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h4N33c0U000161
	for <perforce@freebsd.org>; Thu, 22 May 2003 20:03:38 -0700 (PDT)
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h4N33csU000157
	for perforce@freebsd.org; Thu, 22 May 2003 20:03:38 -0700 (PDT)
Date: Thu, 22 May 2003 20:03:38 -0700 (PDT)
Message-Id: <200305230303.h4N33csU000157@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter@freebsd.org using -f
From: Peter Wemm <peter@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 31668 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: Fri, 23 May 2003 03:03:40 -0000

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

Change 31668 by peter@peter_hammer on 2003/05/22 20:03:02

	reactivate pmap_object_init_pt()

Affected files ...

.. //depot/projects/hammer/sys/amd64/amd64/pmap.c#10 edit

Differences ...

==== //depot/projects/hammer/sys/amd64/amd64/pmap.c#10 (text+ko) ====

@@ -2254,8 +2254,7 @@
 		    vm_object_t object, vm_pindex_t pindex,
 		    vm_size_t size, int limit)
 {
-#if 0
-	vm_offset_t tmpidx;
+	vm_pindex_t tmpidx;
 	int psize;
 	vm_page_t p, mpte;
 
@@ -2271,14 +2270,12 @@
 	    ((addr & (NBPDR - 1)) == 0) && ((size & (NBPDR - 1)) == 0)) {
 		int i;
 		vm_page_t m[1];
-		unsigned int ptepindex;
 		int npdes;
-		pd_entry_t ptepa;
+		pd_entry_t ptepa, *pde;
 
-		ptepindex = pmap_pde_pindex(addr);
-		if (pmap->pm_pdir[ptepindex])
+		pde = pmap_pde(pmap, addr);
+		if (pde != 0 && (*pde & PG_V) != 0)
 			return;
-
 retry:
 		p = vm_page_lookup(object, pindex);
 		if (p != NULL) {
@@ -2314,10 +2311,9 @@
 		pmap->pm_stats.resident_count += size >> PAGE_SHIFT;
 		npdes = size >> PDRSHIFT;
 		for(i = 0; i < npdes; i++) {
-			pde_store(&pmap->pm_pdir[ptepindex],
-			    ptepa | PG_U | PG_RW | PG_V | PG_PS);
+			pde_store(pde, ptepa | PG_U | PG_RW | PG_V | PG_PS);
 			ptepa += NBPDR;
-			ptepindex += 1;
+			pde++;
 		}
 		pmap_invalidate_all(kernel_pmap);
 		return;
@@ -2377,8 +2373,6 @@
 		}
 		vm_page_unlock_queues();
 	}
-	return;
-#endif
 }
 
 /*