ubchist is not a fully cooked kadaver and though use the other well formed pdhist one until ubc gaets back. art@ ok

4 files changed, 13 insertions, 17 deletions

diff --git a/sys/uvm/uvm.h b/sys/uvm/uvm.h
index b2216fcc92f..0901aef1d91 100644
--- a/sys/uvm/uvm.h
+++ b/sys/uvm/uvm.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uvm.h,v 1.16 2001/12/19 08:58:07 art Exp $	*/
+/*	$OpenBSD: uvm.h,v 1.17 2003/03/29 01:13:57 mickey Exp $	*/
 /*	$NetBSD: uvm.h,v 1.24 2000/11/27 08:40:02 chs Exp $	*/
 
 /*
@@ -151,7 +151,6 @@ extern struct uvm uvm;
 
 UVMHIST_DECL(maphist);
 UVMHIST_DECL(pdhist);
-UVMHIST_DECL(ubchist);
 
 /*
  * UVM_UNLOCK_AND_WAIT: atomic unlock+wait... wrapper around the
diff --git a/sys/uvm/uvm_page.c b/sys/uvm/uvm_page.c
index fc64d5abc4d..a0a2a484b55 100644
--- a/sys/uvm/uvm_page.c
+++ b/sys/uvm/uvm_page.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uvm_page.c,v 1.46 2002/10/12 01:09:45 krw Exp $	*/
+/*	$OpenBSD: uvm_page.c,v 1.47 2003/03/29 01:13:57 mickey Exp $	*/
 /*	$NetBSD: uvm_page.c,v 1.44 2000/11/27 08:40:04 chs Exp $	*/
 
 /* 
@@ -1227,19 +1227,19 @@ uvm_page_unbusy(pgs, npgs)
 	struct vm_page *pg;
 	struct uvm_object *uobj;
 	int i;
-	UVMHIST_FUNC("uvm_page_unbusy"); UVMHIST_CALLED(ubchist);
+	UVMHIST_FUNC("uvm_page_unbusy"); UVMHIST_CALLED(pdhist);
 
 	for (i = 0; i < npgs; i++) {
 		pg = pgs[i];
 
-		if (pg == NULL) {
+		if (pg == NULL || pg == PGO_DONTCARE) {
 			continue;
 		}
 		if (pg->flags & PG_WANTED) {
 			wakeup(pg);
 		}
 		if (pg->flags & PG_RELEASED) {
-			UVMHIST_LOG(ubchist, "releasing pg %p", pg,0,0,0);
+			UVMHIST_LOG(pdhist, "releasing pg %p", pg,0,0,0);
 			uobj = pg->uobject;
 			if (uobj != NULL) {
 				uobj->pgops->pgo_releasepg(pg, NULL);
@@ -1249,7 +1249,7 @@ uvm_page_unbusy(pgs, npgs)
 				uvm_anfree(pg->uanon);
 			}
 		} else {
-			UVMHIST_LOG(ubchist, "unbusying pg %p", pg,0,0,0);
+			UVMHIST_LOG(pdhist, "unbusying pg %p", pg,0,0,0);
 			pg->flags &= ~(PG_WANTED|PG_BUSY);
 			UVM_PAGE_OWN(pg, NULL);
 		}
diff --git a/sys/uvm/uvm_pager.c b/sys/uvm/uvm_pager.c
index cacc3de236a..dd48691e769 100644
--- a/sys/uvm/uvm_pager.c
+++ b/sys/uvm/uvm_pager.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uvm_pager.c,v 1.33 2002/10/29 18:30:21 art Exp $	*/
+/*	$OpenBSD: uvm_pager.c,v 1.34 2003/03/29 01:13:57 mickey Exp $	*/
 /*	$NetBSD: uvm_pager.c,v 1.36 2000/11/27 18:26:41 chs Exp $	*/
 
 /*
@@ -432,7 +432,7 @@ uvm_pager_put(uobj, pg, ppsp_ptr, npages, flags, start, stop)
 	int result;
 	daddr_t swblk;
 	struct vm_page **ppsp = *ppsp_ptr;
-	UVMHIST_FUNC("uvm_pager_put"); UVMHIST_CALLED(ubchist);
+	UVMHIST_FUNC("uvm_pager_put"); UVMHIST_CALLED(pdhist);
 
 	/*
 	 * note that uobj is null  if we are doing a swap-backed pageout.
@@ -484,7 +484,7 @@ ReTry:
 	if (uobj) {
 		/* object is locked */
 		result = uobj->pgops->pgo_put(uobj, ppsp, *npages, flags);
-		UVMHIST_LOG(ubchist, "put -> %d", result, 0,0,0);
+		UVMHIST_LOG(pdhist, "put -> %d", result, 0,0,0);
 		/* object is now unlocked */
 	} else {
 		/* nothing locked */
@@ -796,8 +796,8 @@ uvm_aio_aiodone(bp)
 	struct uvm_object *uobj;
 	int i, error;
 	boolean_t write, swap;
-	UVMHIST_FUNC("uvm_aio_aiodone"); UVMHIST_CALLED(ubchist);
-	UVMHIST_LOG(ubchist, "bp %p", bp, 0,0,0);
+	UVMHIST_FUNC("uvm_aio_aiodone"); UVMHIST_CALLED(pdhist);
+	UVMHIST_LOG(pdhist, "bp %p", bp, 0,0,0);
 
 	splassert(IPL_BIO);
 
@@ -813,7 +813,7 @@ uvm_aio_aiodone(bp)
 	uobj = NULL;
 	for (i = 0; i < npages; i++) {
 		pgs[i] = uvm_pageratop((vaddr_t)bp->b_data + (i << PAGE_SHIFT));
-		UVMHIST_LOG(ubchist, "pgs[%d] = %p", i, pgs[i],0,0);
+		UVMHIST_LOG(pdhist, "pgs[%d] = %p", i, pgs[i],0,0);
 	}
 	uvm_pagermapout((vaddr_t)bp->b_data, npages);
 #ifdef UVM_SWAP_ENCRYPT
diff --git a/sys/uvm/uvm_stat.c b/sys/uvm/uvm_stat.c
index ac5546eb6fc..82404906375 100644
--- a/sys/uvm/uvm_stat.c
+++ b/sys/uvm/uvm_stat.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uvm_stat.c,v 1.13 2002/03/14 01:27:19 millert Exp $	 */
+/*	$OpenBSD: uvm_stat.c,v 1.14 2003/03/29 01:13:57 mickey Exp $	 */
 /*	$NetBSD: uvm_stat.c,v 1.18 2001/03/09 01:02:13 chs Exp $	 */
 
 /*
@@ -180,9 +180,6 @@ uvm_hist(bitmask)
 	if ((bitmask & UVMHIST_PDHIST) || bitmask == 0)
 		hists[i++] = &pdhist;
 
-	if ((bitmask & UVMHIST_UBCHIST) || bitmask == 0)
-		hists[i++] = &ubchist;
-
 	hists[i] = NULL;
 
 	uvmhist_dump_histories(hists);