From owner-p4-projects@FreeBSD.ORG  Tue Mar 14 21:53:22 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id F1E4516A422; Tue, 14 Mar 2006 21:53:21 +0000 (UTC)
X-Original-To: perforce@freebsd.org
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 D25DF16A41F
	for <perforce@freebsd.org>; Tue, 14 Mar 2006 21:53:21 +0000 (UTC)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 9CFDA43D48
	for <perforce@freebsd.org>; Tue, 14 Mar 2006 21:53:21 +0000 (GMT)
	(envelope-from peter@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 k2ELrLKQ090973
	for <perforce@freebsd.org>; Tue, 14 Mar 2006 21:53:21 GMT
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2ELrLw2090970
	for perforce@freebsd.org; Tue, 14 Mar 2006 21:53:21 GMT
	(envelope-from peter@freebsd.org)
Date: Tue, 14 Mar 2006 21:53:21 GMT
Message-Id: <200603142153.k2ELrLw2090970@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>
Cc: 
Subject: PERFORCE change 93312 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, 14 Mar 2006 21:53:22 -0000

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

Change 93312 by peter@peter_daintree on 2006/03/14 21:52:28

	Compile fixes

Affected files ...

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

Differences ...

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

@@ -197,7 +197,7 @@
  */
 static caddr_t crashdumpmap;
 
-static PMAP_INLINE void	free_pv_entry(pmap_t pmap, pv_entry_t pv);
+static void	free_pv_entry(pmap_t pmap, pv_entry_t pv);
 static pv_entry_t get_pv_entry(pmap_t locked_pmap);
 static void	pmap_clear_ptes(vm_page_t m, long bit);
 
@@ -1500,7 +1500,7 @@
 			pmap_unuse_pt(pmap, va, ptepde);
 			if (pmap != locked_pmap)
 				PMAP_UNLOCK(pmap);
-			free_pv_entry(pv);
+			free_pv_entry(locked_pmap, pv);
 		}
 	}
 }
@@ -1509,7 +1509,7 @@
 /*
  * free the pv_entry back to the free list
  */
-static PMAP_INLINE void
+static void
 free_pv_entry(pmap_t pmap, pv_entry_t pv)
 {
 	vm_page_t m;
@@ -1551,7 +1551,7 @@
 	struct pv_chunk *pc;
 	vm_page_t m;
 
-	PMAP_LOCK_ASSERT(locked_pmap, MA_OWNED);
+	PMAP_LOCK_ASSERT(pmap, MA_OWNED);
 	mtx_assert(&vm_page_queue_mtx, MA_OWNED);
 	pv_entry_count++;
 	if (pv_entry_count > pv_entry_high_water)
@@ -1585,10 +1585,10 @@
 			printf("Approaching the limit on PV entries, consider "
 			    "increasing sysctl vm.pmap.shpgperproc or "
 			    "vm.pmap.pv_entry_max\n");
-		pmap_collect(locked_pmap, &vm_page_queues[PQ_INACTIVE]);
+		pmap_collect(pmap, &vm_page_queues[PQ_INACTIVE]);
 		m = vm_page_alloc(NULL, colour, VM_ALLOC_SYSTEM | VM_ALLOC_NOOBJ);
 		if (m == NULL) {
-			pmap_collect(locked_pmap, &vm_page_queues[PQ_ACTIVE]);
+			pmap_collect(pmap, &vm_page_queues[PQ_ACTIVE]);
 			m = vm_page_alloc(NULL, colour, VM_ALLOC_SYSTEM | VM_ALLOC_NOOBJ);
 			if (m == NULL)
 				panic("get_pv_entry: increase vm.pmap.shpgperproc");