PERFORCE change 95533 for review

[Marcel Moolenaar]

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

Change 95533 by marcel at marcel_nfs on 2006/04/18 21:00:21

	IFC @95528

Affected files ...

.. //depot/projects/uart/amd64/amd64/pmap.c#32 integrate
.. //depot/projects/uart/kern/kern_rwlock.c#4 integrate

Differences ...

==== //depot/projects/uart/amd64/amd64/pmap.c#32 (text+ko) ====

@@ -77,7 +77,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.545 2006/04/13 03:31:48 alc Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.547 2006/04/18 20:17:32 peter Exp $");
 
 /*
  *	Manages physical address maps.
@@ -1547,7 +1547,7 @@
 
 	PV_STAT(pv_entry_frees++);
 	PV_STAT(pv_entry_spare++);
-	PV_STAT(pv_entry_count--);
+	pv_entry_count--;
 	pc = pv_to_chunk(pv);
 	idx = pv - &pc->pc_pventry[0];
 	field = idx / 64;
@@ -1588,7 +1588,7 @@
 	PMAP_LOCK_ASSERT(pmap, MA_OWNED);
 	mtx_assert(&vm_page_queue_mtx, MA_OWNED);
 	PV_STAT(pv_entry_allocs++);
-	PV_STAT(pv_entry_count++);
+	pv_entry_count++;
 	if (pv_entry_count > pv_entry_high_water)
 		pagedaemon_wakeup();
 	pc = TAILQ_FIRST(&pmap->pm_pvchunk);
@@ -1616,6 +1616,7 @@
 	m = vm_page_alloc(NULL, colour, VM_ALLOC_SYSTEM | VM_ALLOC_NOOBJ);
 	if (m == NULL) {
 		if (try) {
+			pv_entry_count--;
 			PV_STAT(pc_chunk_tryfail++);
 			return (NULL);
 		}
@@ -2777,7 +2778,7 @@
 				/* Mark free */
 				PV_STAT(pv_entry_frees++);
 				PV_STAT(pv_entry_spare++);
-				PV_STAT(pv_entry_count--);
+				pv_entry_count--;
 				pc->pc_map[field] |= bitmask;
 				m->md.pv_list_count--;
 				TAILQ_REMOVE(&m->md.pv_list, pv, pv_list);

==== //depot/projects/uart/kern/kern_rwlock.c#4 (text+ko) ====

@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/kern_rwlock.c,v 1.7 2006/04/18 18:27:54 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/kern_rwlock.c,v 1.8 2006/04/18 20:32:42 wkoszek Exp $");
 
 #include "opt_ddb.h"
 
@@ -135,7 +135,9 @@
 void
 _rw_rlock(struct rwlock *rw, const char *file, int line)
 {
+#ifdef SMP
 	volatile struct thread *owner;
+#endif
 	uintptr_t x;
 
 	KASSERT(rw_wowner(rw) != curthread,
@@ -388,7 +390,9 @@
 void
 _rw_wlock_hard(struct rwlock *rw, uintptr_t tid, const char *file, int line)
 {
+#ifdef SMP
 	volatile struct thread *owner;
+#endif
 	uintptr_t v;
 
 	if (LOCK_LOG_TEST(&rw->rw_object, 0))