 @@ -1,14 +1,14 @@
-/*	$NetBSD: uvm_pdpolicy_clockpro.c,v 1.13 2008/02/07 12:27:38 yamt Exp $	*/
+/*	$NetBSD: uvm_pdpolicy_clockpro.c,v 1.14 2008/03/22 05:50:42 bjs Exp $	*/
 /*-
  * Copyright (c)2005, 2006 YAMAMOTO Takashi,
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -33,27 +33,27 @@
  * approximation of the list of non-resident pages using hash:
  *	http://linux-mm.org/ClockProApproximation
  */
 /* #define	CLOCKPRO_DEBUG */
 #if defined(PDSIM)
 #include "pdsim.h"
 #else /* defined(PDSIM) */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_pdpolicy_clockpro.c,v 1.13 2008/02/07 12:27:38 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_pdpolicy_clockpro.c,v 1.14 2008/03/22 05:50:42 bjs Exp $");
 #include "opt_ddb.h"
 #include <sys/param.h>
 #include <sys/proc.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/hash.h>
 #include <uvm/uvm.h>
 #include <uvm/uvm_pdpolicy.h>
 #include <uvm/uvm_pdpolicy_impl.h>
 @@ -226,33 +226,35 @@ pageq_first(const pageq_t *q)
+{
 	return TAILQ_FIRST(&q->q_q);
+}
 static void
 pageq_insert_tail(pageq_t *q, struct vm_page *pg)
+{
 	TAILQ_INSERT_TAIL(&q->q_q, pg, pageq);
 	q->q_len++;
+}
 #if defined(LISTQ)
 static void
 pageq_insert_head(pageq_t *q, struct vm_page *pg)
+{
 	TAILQ_INSERT_HEAD(&q->q_q, pg, pageq);
 	q->q_len++;
+}
 #endif
 static void
 pageq_remove(pageq_t *q, struct vm_page *pg)
+{
 #if 1
 	KASSERT(clockpro_queue(&clockpro, clockpro_getq(pg)) == q);
 #endif
 	KASSERT(q->q_len > 0);
 	TAILQ_REMOVE(&q->q_q, pg, pageq);
 	q->q_len--;
+}
 @@ -271,35 +273,37 @@ pageq_remove_head(pageq_t *q)
+}
 /* ---------------------------------------- */
 static void
 clockpro_insert_tail(struct clockpro_state *s, int qidx, struct vm_page *pg)
+{
 	pageq_t *q = clockpro_queue(s, qidx);
 	clockpro_setq(pg, qidx);
 	pageq_insert_tail(q, pg);
+}
 #if defined(LISTQ)
 static void
 clockpro_insert_head(struct clockpro_state *s, int qidx, struct vm_page *pg)
+{
 	pageq_t *q = clockpro_queue(s, qidx);
 	clockpro_setq(pg, qidx);
 	pageq_insert_head(q, pg);
+}
 #endif
 /* ---------------------------------------- */
 typedef uint32_t nonres_cookie_t;
 #define	NONRES_COOKIE_INVAL	0
 typedef uintptr_t objid_t;
 /*
  * XXX maybe these hash functions need reconsideration,
  * given that hash distribution is critical here.
  */
 static uint32_t
 @@ -1335,27 +1339,27 @@ clockpro_dump(void)
 #if defined(LISTQ)
 		if ((pg->pqflags & PQ_HOT) == 0) {
 			printf("cold page in hotq: %p\n", pg);
+		}
 #endif /* defined(LISTQ) */
 		COUNT(pg)
 		hotqlen++;
+	}
 	PRINTCOUNT("hotq");
 	INITCOUNT();
 	TAILQ_FOREACH(pg, &clockpro_queue(s, CLOCKPRO_LISTQ)->q_q, pageq) {
 #if !defined(LISTQ)
-		printf("listq %p\n");
+		printf("listq %p\n", pg);
 #endif /* !defined(LISTQ) */
 		if (clockpro_getq(pg) != CLOCKPRO_LISTQ) {
 			printf("listq corrupt %p\n", pg);
+		}
 		COUNT(pg)
 		listqlen++;
+	}
 	PRINTCOUNT("listq");
 	printf("newqlen=%d/%d, coldqlen=%d/%d, hotqlen=%d/%d, listqlen=%d/%d\n",
 	    newqlen, pageq_len(clockpro_queue(s, CLOCKPRO_NEWQ)),
 	    coldqlen, pageq_len(clockpro_queue(s, CLOCKPRO_COLDQ)),
 	    hotqlen, pageq_len(clockpro_queue(s, CLOCKPRO_HOTQ)),