PERFORCE change 93312 for review

[Peter Wemm]

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

Change 93312 by peter at 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");