From ccbcd7c873a21b2a458d770fa5bb29b8ccc0f9d8 Mon Sep 17 00:00:00 2001
From: chs <chs@NetBSD.org>
Date: Fri, 24 Nov 2000 18:54:31 +0000
Subject: [PATCH] use queue.h macros and other misc cleanup.

---
 sys/uvm/uvm_meter.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/sys/uvm/uvm_meter.c b/sys/uvm/uvm_meter.c
index 790c000c6081..4e5819e58946 100644
--- a/sys/uvm/uvm_meter.c
+++ b/sys/uvm/uvm_meter.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: uvm_meter.c,v 1.13 2000/06/27 17:29:27 mrg Exp $	*/
+/*	$NetBSD: uvm_meter.c,v 1.14 2000/11/24 18:54:31 chs Exp $	*/
 
 /*
  * Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -52,7 +52,7 @@
  */
 
 int maxslp = MAXSLP;	/* patchable ... */
-struct loadavg averunnable; /* decl. */
+struct loadavg averunnable;
 
 /*
  * constants for averages over 1, 5, and 15 minutes when sampling at 
@@ -81,7 +81,7 @@ uvm_meter()
 	if ((time.tv_sec % 5) == 0)
 		uvm_loadav(&averunnable);
 	if (proc0.p_slptime > (maxslp / 2))
-		wakeup((caddr_t)&proc0);
+		wakeup(&proc0);
 }
 
 /*
@@ -96,7 +96,8 @@ uvm_loadav(avg)
 	struct proc *p;
 
 	proclist_lock_read();
-	for (nrun = 0, p = allproc.lh_first; p != 0; p = p->p_list.le_next) {
+	nrun = 0;
+	LIST_FOREACH(p, &allproc, p_list) {
 		switch (p->p_stat) {
 		case SSLEEP:
 			if (p->p_priority > PZERO || p->p_slptime > 1)
@@ -177,7 +178,7 @@ uvm_total(totalp)
 	 */
 
 	proclist_lock_read();
-	for (p = allproc.lh_first; p != 0; p = p->p_list.le_next) {
+	LIST_FOREACH(p, &allproc, p_list) {
 		if (p->p_flag & P_SYSTEM)
 			continue;
 		switch (p->p_stat) {