 @@ -1,14 +1,14 @@
-/*	$NetBSD: uvm_pdaemon.c,v 1.93.4.2.4.13 2012/04/17 00:19:30 matt Exp $	*/
+/*	$NetBSD: uvm_pdaemon.c,v 1.93.4.2.4.14 2012/04/27 20:41:09 matt Exp $	*/
 /*
  * Copyright (c) 1997 Charles D. Cranor and Washington University.
  * Copyright (c) 1991, 1993, The Regents of the University of California.
+ *
  * All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * The Mach Operating System project at Carnegie-Mellon University.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
 @@ -61,27 +61,27 @@
  *  School of Computer Science
  *  Carnegie Mellon University
  *  Pittsburgh PA 15213-3890
+ *
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  */
 /*
  * uvm_pdaemon.c: the page daemon
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_pdaemon.c,v 1.93.4.2.4.13 2012/04/17 00:19:30 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_pdaemon.c,v 1.93.4.2.4.14 2012/04/27 20:41:09 matt Exp $");
 #include "opt_uvmhist.h"
 #include "opt_readahead.h"
 #include <sys/param.h>
 #include <sys/proc.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/pool.h>
 #include <sys/buf.h>
 #include <sys/atomic.h>
 #include <uvm/uvm.h>
 @@ -395,27 +395,26 @@ uvm_pageout(void *arg)
 		if (progress == false
 		    || (pdinfo->pd_waiters == 0
 		        && TAILQ_FIRST(&pdinfo->pd_pendingq) == NULL)) {
 			UVMHIST_LOG(pdhist,"  <<SLEEPING>>",0,0,0,0);
 			pdinfo->pd_stalled = !progress
 			    && pdinfo->pd_waiters > 0;
 			int timo = (pdinfo->pd_stalled ? 2 * hz : 0);
 			UVM_UNLOCK_AND_WAIT(&uvm.pagedaemon,
 			    &uvm_fpageqlock, false, "pgdaemon", timo);
 			uvmexp.pdwoke++;
 			UVMHIST_LOG(pdhist,"  <<WOKE UP>>",0,0,0,0);
 			want_tune = pdinfo->pd_stalled;
 			pdinfo->pd_stalled = false;
 			progress = false;
 		} else if (TAILQ_FIRST(&pdinfo->pd_pendingq) == NULL) {
 			/*
 			 * Someone is waiting but no group are pending.
 			 * Let's kick ourselves to find groups that need work.
 			 */
 			uvm_kick_pdaemon();
 			mutex_spin_exit(&uvm_fpageqlock);
 		} else {
 			mutex_spin_exit(&uvm_fpageqlock);
+		}
 		/*
 		 * now lock page queues and recompute inactive count
 @@ -430,26 +429,27 @@ uvm_pageout(void *arg)
 		    || want_tune) {
 			npages = uvmexp.npages;
 			extrapages = uvm_extrapages;
 			npggroups = uvmexp.npggroups;
 			uvmpd_tune();
 			want_tune = false;
+		}
 		/*
 		 * Estimate a hint.  Note that bufmem are returned to
 		 * system only when entire pool page is empty.
 		 */
 		bool need_wakeup = false;
 		progress = false;
 		while ((grp = TAILQ_FIRST(&pdinfo->pd_pendingq)) != NULL) {
 			KASSERT(grp->pgrp_npages > 0);
 			uvmpdpol_tune(grp);
 			/*
 			 * While we are locked, remove this from the pendingq.
 			 */
 			uvmpd_checkgroup(grp);
 			KASSERT(grp->pgrp_scan_needed);
 			TAILQ_REMOVE(&pdinfo->pd_pendingq, grp,
 			    pgrp_pending_link);
 			grp->pgrp_scan_needed = false;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: uvm_pdpolicy_clock.c,v 1.12.16.7 2012/04/17 00:12:21 matt Exp $	*/
+/*	$NetBSD: uvm_pdpolicy_clock.c,v 1.12.16.8 2012/04/27 20:41:09 matt Exp $	*/
 /*	NetBSD: uvm_pdaemon.c,v 1.72 2006/01/05 10:47:33 yamt Exp $	*/
 /*
  * Copyright (c) 1997 Charles D. Cranor and Washington University.
  * Copyright (c) 1991, 1993, The Regents of the University of California.
+ *
  * All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * The Mach Operating System project at Carnegie-Mellon University.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
 @@ -64,27 +64,27 @@
  *  Pittsburgh PA 15213-3890
+ *
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  */
 #if defined(PDSIM)
 #include "pdsim.h"
 #else /* defined(PDSIM) */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_pdpolicy_clock.c,v 1.12.16.7 2012/04/17 00:12:21 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_pdpolicy_clock.c,v 1.12.16.8 2012/04/27 20:41:09 matt Exp $");
 #include <sys/param.h>
 #include <sys/proc.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <uvm/uvm.h>
 #include <uvm/uvm_pdpolicy.h>
 #include <uvm/uvm_pdpolicy_impl.h>
 #endif /* defined(PDSIM) */
 #define PQ_INACTIVE	PQ_PRIVATE1	/* page is in inactive list */
 @@ -424,27 +424,26 @@ uvmpdpol_pagedequeue(struct vm_page *pg)
+{
 	struct uvm_pggroup * const grp = uvm_page_to_pggroup(pg);
 	struct uvmpdpol_groupstate * const gs = grp->pgrp_gs;
 	KASSERT(!(pg->pqflags & PQ_FREE));
 	KASSERT(mutex_owned(&uvm_pageqlock));
 	//KDASSERT(gs->gs_radioactive == clock_pglist_count(&gs->gs_radioactiveq));
 	if (pg->pqflags & PQ_RADIOACTIVE) {
 		TAILQ_REMOVE(&gs->gs_radioactiveq, pg, pageq.queue);
 		pg->pqflags &= ~PQ_RADIOACTIVE;
 		KASSERT(gs->gs_radioactive > 0);
 		gs->gs_radioactive--;
 		grp->pgrp_active--;
+	}
 	//KDASSERT(gs->gs_radioactive == clock_pglist_count(&gs->gs_radioactiveq));
 	//KDASSERT(gs->gs_active == clock_pglist_count(&gs->gs_activeq));
 	if (pg->pqflags & PQ_ACTIVE) {
 		TAILQ_REMOVE(&gs->gs_activeq, pg, pageq.queue);
 		pg->pqflags &= ~PQ_ACTIVE;
 		KASSERT(gs->gs_active > 0);
 		gs->gs_active--;
 		grp->pgrp_active--;
+	}