Replace thread_wakeup() with wakeup(). It is defined in vm_extern.h as a

wrapper, so this removes a dependence on the old VM system.  From NetBSD.
art@ ok

10 files changed, 38 insertions, 38 deletions

diff --git a/sys/uvm/uvm_aobj.c b/sys/uvm/uvm_aobj.c
index 3484d03f55e..79d294f19fc 100644
--- a/sys/uvm/uvm_aobj.c
+++ b/sys/uvm/uvm_aobj.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uvm_aobj.c,v 1.7 2001/01/29 02:07:43 niklas Exp $	*/
+/*	$OpenBSD: uvm_aobj.c,v 1.8 2001/03/08 15:21:36 smart Exp $	*/
 /*	$NetBSD: uvm_aobj.c,v 1.20 1999/05/25 00:09:00 thorpej Exp $	*/
 
 /*
@@ -983,7 +983,7 @@ uao_get(uobj, offset, pps, npagesp, centeridx, access_type, advice, flags)
 				    rv,0,0,0);
 				if (ptmp->flags & PG_WANTED)
 					/* object lock still held */
-					thread_wakeup(ptmp);
+					wakeup(ptmp);
 				ptmp->flags &= ~(PG_WANTED|PG_BUSY);
 				UVM_PAGE_OWN(ptmp, NULL);
 				uvm_lock_pageq();
diff --git a/sys/uvm/uvm_fault.c b/sys/uvm/uvm_fault.c
index f985f2cb294..0834cd17eb2 100644
--- a/sys/uvm/uvm_fault.c
+++ b/sys/uvm/uvm_fault.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uvm_fault.c,v 1.6 2001/01/29 02:07:44 niklas Exp $	*/
+/*	$OpenBSD: uvm_fault.c,v 1.7 2001/03/08 15:21:36 smart Exp $	*/
 /*	$NetBSD: uvm_fault.c,v 1.33 1999/06/04 23:38:41 thorpej Exp $	*/
 
 /*
@@ -436,7 +436,7 @@ int uvmfault_anonget(ufi, amap, anon)
 
 			if (pg->flags & PG_WANTED) {
 				/* still holding object lock */
-				thread_wakeup(pg);	
+				wakeup(pg);	
 			}
 			/* un-busy! */
 			pg->flags &= ~(PG_WANTED|PG_BUSY|PG_FAKE);
@@ -1383,7 +1383,7 @@ Case2:
 			    0,0,0,0);
 			if (uobjpage->flags & PG_WANTED)
 				/* still holding object lock */
-				thread_wakeup(uobjpage);
+				wakeup(uobjpage);
 
 			if (uobjpage->flags & PG_RELEASED) {
 				uvmexp.fltpgrele++;
@@ -1473,7 +1473,7 @@ Case2:
 					 * be released
 					 * */
 					if (uobjpage->flags & PG_WANTED)
-						thread_wakeup(uobjpage);
+						wakeup(uobjpage);
 					uobjpage->flags &= ~(PG_BUSY|PG_WANTED);
 					UVM_PAGE_OWN(uobjpage, NULL);
 
@@ -1505,7 +1505,7 @@ Case2:
 				pmap_page_protect(PMAP_PGARG(uobjpage),
 				    VM_PROT_NONE); 
 				if (uobjpage->flags & PG_WANTED)
-					thread_wakeup(uobjpage);
+					wakeup(uobjpage);
 				/* uobj still locked */
 				uobjpage->flags &= ~(PG_WANTED|PG_BUSY);
 				UVM_PAGE_OWN(uobjpage, NULL);
@@ -1563,7 +1563,7 @@ Case2:
 			if (uobjpage != PGO_DONTCARE) {
 				if (uobjpage->flags & PG_WANTED)
 					/* still holding object lock */
-					thread_wakeup(uobjpage);
+					wakeup(uobjpage);
 
 				uvm_lock_pageq();
 				/* make sure it is in queues */
@@ -1622,7 +1622,7 @@ Case2:
 
 			if (uobjpage->flags & PG_WANTED)
 				/* still have the obj lock */
-				thread_wakeup(uobjpage);
+				wakeup(uobjpage);
 			uobjpage->flags &= ~(PG_BUSY|PG_WANTED);
 			UVM_PAGE_OWN(uobjpage, NULL);
 			uvm_lock_pageq();
@@ -1688,7 +1688,7 @@ Case2:
 	uvm_unlock_pageq();
 
 	if (pg->flags & PG_WANTED)
-		thread_wakeup(pg);		/* lock still held */
+		wakeup(pg);		/* lock still held */
 
 	/* 
 	 * note that pg can't be PG_RELEASED since we did not drop the object 
diff --git a/sys/uvm/uvm_km.c b/sys/uvm/uvm_km.c
index bc3a5843f15..e09e3199271 100644
--- a/sys/uvm/uvm_km.c
+++ b/sys/uvm/uvm_km.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uvm_km.c,v 1.7 2001/01/29 02:07:45 niklas Exp $	*/
+/*	$OpenBSD: uvm_km.c,v 1.8 2001/03/08 15:21:36 smart Exp $	*/
 /*	$NetBSD: uvm_km.c,v 1.27 1999/06/04 23:38:41 thorpej Exp $	*/
 
 /* 
@@ -881,7 +881,7 @@ uvm_km_free_wakeup(map, addr, size)
 	vm_map_lock(map);
 	(void)uvm_unmap_remove(map, trunc_page(addr), round_page(addr+size), 
 			 &dead_entries);
-	thread_wakeup(map);
+	wakeup(map);
 	vm_map_unlock(map);
 
 	if (dead_entries != NULL)
diff --git a/sys/uvm/uvm_loan.c b/sys/uvm/uvm_loan.c
index 050d86e3f17..6ec2a96d307 100644
--- a/sys/uvm/uvm_loan.c
+++ b/sys/uvm/uvm_loan.c
@@ -1,5 +1,5 @@
-/*	$OpenBSD: uvm_loan.c,v 1.5 2001/01/29 02:07:45 niklas Exp $	*/
-/*	$NetBSD: uvm_loan.c,v 1.17 1999/06/03 00:05:45 thorpej Exp $	*/
+/*	$OpenBSD: uvm_loan.c,v 1.6 2001/03/08 15:21:37 smart Exp $	*/
+/*	$NetBSD: uvm_loan.c,v 1.18 1999/07/22 22:58:38 thorpej Exp $	*/
 
 /*
  *
@@ -501,7 +501,7 @@ uvm_loanuobj(ufi, output, flags, va)
 
 			if (pg->flags & PG_WANTED)
 				/* still holding object lock */
-				thread_wakeup(pg);
+				wakeup(pg);
 
 			if (pg->flags & PG_RELEASED) {
 #ifdef DIAGNOSTIC
@@ -540,7 +540,7 @@ uvm_loanuobj(ufi, output, flags, va)
 		**output = pg;
 		*output = (*output) + 1;
 		if (pg->flags & PG_WANTED)
-			thread_wakeup(pg);
+			wakeup(pg);
 		pg->flags &= ~(PG_WANTED|PG_BUSY);
 		UVM_PAGE_OWN(pg, NULL);
 		return(1);		/* got it! */
@@ -564,7 +564,7 @@ uvm_loanuobj(ufi, output, flags, va)
 		uvm_pageactivate(pg);	/* reactivate */
 		uvm_unlock_pageq();
 		if (pg->flags & PG_WANTED)
-			thread_wakeup(pg);
+			wakeup(pg);
 		pg->flags &= ~(PG_WANTED|PG_BUSY);
 		UVM_PAGE_OWN(pg, NULL);
 		return(1);
@@ -577,7 +577,7 @@ uvm_loanuobj(ufi, output, flags, va)
 	anon = uvm_analloc();
 	if (anon == NULL) {		/* out of VM! */
 		if (pg->flags & PG_WANTED)
-			thread_wakeup(pg);
+			wakeup(pg);
 		pg->flags &= ~(PG_WANTED|PG_BUSY);
 		UVM_PAGE_OWN(pg, NULL);
 		uvmfault_unlockall(ufi, amap, uobj, NULL);
@@ -594,7 +594,7 @@ uvm_loanuobj(ufi, output, flags, va)
 	**output = anon;
 	*output = (*output) + 1;
 	if (pg->flags & PG_WANTED)
-		thread_wakeup(pg);
+		wakeup(pg);
 	pg->flags &= ~(PG_WANTED|PG_BUSY);
 	UVM_PAGE_OWN(pg, NULL);
 	return(1);
diff --git a/sys/uvm/uvm_page.c b/sys/uvm/uvm_page.c
index fb648048774..86f834c0fdf 100644
--- a/sys/uvm/uvm_page.c
+++ b/sys/uvm/uvm_page.c
@@ -1,5 +1,5 @@
-/*	$OpenBSD: uvm_page.c,v 1.12 2001/03/03 12:28:55 art Exp $	*/
-/*	$NetBSD: uvm_page.c,v 1.23 1999/05/25 01:34:13 thorpej Exp $	*/
+/*	$OpenBSD: uvm_page.c,v 1.13 2001/03/08 15:21:37 smart Exp $	*/
+/*	$NetBSD: uvm_page.c,v 1.24 1999/07/22 22:58:38 thorpej Exp $	*/
 
 /* 
  * Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -859,7 +859,7 @@ uvm_pagealloc_strat(obj, off, anon, flags, strat, free_list)
 
 	if (uvmexp.free < uvmexp.freemin || (uvmexp.free < uvmexp.freetarg &&
 	    uvmexp.inactive < uvmexp.inactarg))
-		thread_wakeup(&uvm.pagedaemon);
+		wakeup(&uvm.pagedaemon);
 
 	/*
 	 * fail if any of these conditions is true:
diff --git a/sys/uvm/uvm_pager.c b/sys/uvm/uvm_pager.c
index 80acb01ff82..b0def7ef9fd 100644
--- a/sys/uvm/uvm_pager.c
+++ b/sys/uvm/uvm_pager.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uvm_pager.c,v 1.6 2001/01/29 02:07:47 niklas Exp $	*/
+/*	$OpenBSD: uvm_pager.c,v 1.7 2001/03/08 15:21:37 smart Exp $	*/
 /*	$NetBSD: uvm_pager.c,v 1.20 1999/05/26 19:16:36 thorpej Exp $	*/
 
 /*
@@ -646,7 +646,7 @@ int swblk;			/* valid if (uobj == NULL && PGO_REALLOCSWAP) */
 		/* did someone want the page while we had it busy-locked? */
 		if (ppsp[lcv]->flags & PG_WANTED)
 			/* still holding obj lock */
-			thread_wakeup(ppsp[lcv]);
+			wakeup(ppsp[lcv]);
 
 		/* if page was released, release it.  otherwise un-busy it */
 		if (ppsp[lcv]->flags & PG_RELEASED) {
diff --git a/sys/uvm/uvm_pdaemon.c b/sys/uvm/uvm_pdaemon.c
index f8d77cb52a0..d19c5f4d09c 100644
--- a/sys/uvm/uvm_pdaemon.c
+++ b/sys/uvm/uvm_pdaemon.c
@@ -1,5 +1,5 @@
-/*	$OpenBSD: uvm_pdaemon.c,v 1.7 2001/01/29 02:07:48 niklas Exp $	*/
-/*	$NetBSD: uvm_pdaemon.c,v 1.16 1999/05/24 19:10:57 thorpej Exp $	*/
+/*	$OpenBSD: uvm_pdaemon.c,v 1.8 2001/03/08 15:21:37 smart Exp $	*/
+/*	$NetBSD: uvm_pdaemon.c,v 1.17 1999/07/22 22:58:39 thorpej Exp $	*/
 
 /* 
  * Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -146,7 +146,7 @@ void uvm_wait(wmsg)
 	}
 
 	simple_lock(&uvm.pagedaemon_lock);
-	thread_wakeup(&uvm.pagedaemon);		/* wake the daemon! */
+	wakeup(&uvm.pagedaemon);		/* wake the daemon! */
 	UVM_UNLOCK_AND_WAIT(&uvmexp.free, &uvm.pagedaemon_lock, FALSE, wmsg,
 	    timo);
 
@@ -302,7 +302,7 @@ uvm_pageout()
 		 */
 		if (uvmexp.free > uvmexp.reserve_kernel ||
 		    uvmexp.paging == 0)
-			thread_wakeup(&uvmexp.free);
+			wakeup(&uvmexp.free);
 	}
 	/*NOTREACHED*/
 }
@@ -819,7 +819,7 @@ uvmpd_scan_inactive(pglst)
 			/* handle PG_WANTED now */
 			if (p->flags & PG_WANTED)
 				/* still holding object lock */
-				thread_wakeup(p);
+				wakeup(p);
 
 			p->flags &= ~(PG_BUSY|PG_WANTED);
 			UVM_PAGE_OWN(p, NULL);
diff --git a/sys/uvm/uvm_pglist.c b/sys/uvm/uvm_pglist.c
index 2156279ef83..4b18657f22a 100644
--- a/sys/uvm/uvm_pglist.c
+++ b/sys/uvm/uvm_pglist.c
@@ -1,5 +1,5 @@
-/*	$OpenBSD: uvm_pglist.c,v 1.5 2001/01/29 02:07:48 niklas Exp $	*/
-/*	$NetBSD: uvm_pglist.c,v 1.7 1999/05/24 19:10:58 thorpej Exp $	*/
+/*	$OpenBSD: uvm_pglist.c,v 1.6 2001/03/08 15:21:37 smart Exp $	*/
+/*	$NetBSD: uvm_pglist.c,v 1.8 1999/07/22 22:58:39 thorpej Exp $	*/
 
 #define VM_PAGE_ALLOC_MEMORY_STATS
  
@@ -249,7 +249,7 @@ out:
 	if (uvmexp.free < uvmexp.freemin ||
 	    (uvmexp.free < uvmexp.freetarg &&
 	    uvmexp.inactive < uvmexp.inactarg)) 
-		thread_wakeup(&uvm.pagedaemon);
+		wakeup(&uvm.pagedaemon);
 
 	return (error);
 }
diff --git a/sys/uvm/uvm_swap.c b/sys/uvm/uvm_swap.c
index dddb784ef34..6bdfd72b91f 100644
--- a/sys/uvm/uvm_swap.c
+++ b/sys/uvm/uvm_swap.c
@@ -1,5 +1,5 @@
-/*	$OpenBSD: uvm_swap.c,v 1.23 2001/02/24 19:07:12 csapuntz Exp $	*/
-/*	$NetBSD: uvm_swap.c,v 1.27 1999/03/30 16:07:47 chs Exp $	*/
+/*	$OpenBSD: uvm_swap.c,v 1.24 2001/03/08 15:21:37 smart Exp $	*/
+/*	$NetBSD: uvm_swap.c,v 1.28 1999/07/22 22:58:39 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1995, 1996, 1997 Matthew R. Green
@@ -2201,7 +2201,7 @@ uvm_swap_bufdone(bp)
 	TAILQ_INSERT_TAIL(&uvm.aio_done, &sbp->sw_aio, aioq);
 	simple_unlock(&uvm.pagedaemon_lock);
 
-	thread_wakeup(&uvm.pagedaemon);
+	wakeup(&uvm.pagedaemon);
 	splx(s);
 }
 
diff --git a/sys/uvm/uvm_vnode.c b/sys/uvm/uvm_vnode.c
index 9e36936d0e6..ed0b58afc1f 100644
--- a/sys/uvm/uvm_vnode.c
+++ b/sys/uvm/uvm_vnode.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uvm_vnode.c,v 1.10 2001/01/29 02:07:50 niklas Exp $	*/
+/*	$OpenBSD: uvm_vnode.c,v 1.11 2001/03/08 15:21:38 smart Exp $	*/
 /*	$NetBSD: uvm_vnode.c,v 1.23 1999/04/11 04:04:11 chs Exp $	*/
 
 /*
@@ -1161,7 +1161,7 @@ ReTry:
 			if (result != VM_PAGER_PEND) {
 				if (ptmp->flags & PG_WANTED)
 					/* still holding object lock */
-					thread_wakeup(ptmp);
+					wakeup(ptmp);
 
 				ptmp->flags &= ~(PG_WANTED|PG_BUSY);
 				UVM_PAGE_OWN(ptmp, NULL);
@@ -1521,7 +1521,7 @@ uvn_get(uobj, offset, pps, npagesp, centeridx, access_type, advice, flags)
 		if (result != VM_PAGER_OK) {
 			if (ptmp->flags & PG_WANTED)
 				/* object lock still held */
-				thread_wakeup(ptmp);
+				wakeup(ptmp);
 
 			ptmp->flags &= ~(PG_WANTED|PG_BUSY);
 			UVM_PAGE_OWN(ptmp, NULL);