4 files changed, 6 insertions, 6 deletions
diff --git a/sys/vm/vm_meter.c b/sys/vm/vm_meter.c
index d0283ba8366a..3a31ad40eed3 100644
--- a/sys/vm/vm_meter.c
+++ b/sys/vm/vm_meter.c
@@ -79,7 +79,7 @@ loadav(struct loadavg *avg)
 	register struct proc *p;
 
 	ALLPROC_LOCK(AP_SHARED);
-	for (nrun = 0, p = allproc.lh_first; p != 0; p = p->p_list.le_next) {
+	for (nrun = 0, p = LIST_FIRST(&allproc); p != 0; p = LIST_NEXT(p, p_list)) {
 		switch (p->p_stat) {
 		case SSLEEP:
 			if (p->p_priority > PZERO || p->p_slptime != 0)
diff --git a/sys/vm/vm_object.c b/sys/vm/vm_object.c
index 83ab4960a560..1e16917c9445 100644
--- a/sys/vm/vm_object.c
+++ b/sys/vm/vm_object.c
@@ -536,7 +536,7 @@ vm_object_page_clean(object, start, end, flags)
 
 	clearobjflags = 1;
 
-	for(p = TAILQ_FIRST(&object->memq); p; p = TAILQ_NEXT(p, listq)) {
+	TAILQ_FOREACH(p, &object->memq, listq) {
 		vm_page_flag_set(p, PG_CLEANCHK);
 		if ((flags & OBJPC_NOSYNC) && (p->flags & PG_NOSYNC))
 			clearobjflags = 0;
@@ -1620,7 +1620,7 @@ vm_object_in_map( object)
 {
 	struct proc *p;
 	ALLPROC_LOCK(AP_SHARED);
-	for (p = allproc.lh_first; p != 0; p = p->p_list.le_next) {
+	LIST_FOREACH(p, &allproc, p_list) {
 		if( !p->p_vmspace /* || (p->p_flag & (P_SYSTEM|P_WEXIT)) */)
 			continue;
 		if( _vm_object_in_map(&p->p_vmspace->vm_map, object, 0)) {
@@ -1707,7 +1707,7 @@ DB_SHOW_COMMAND(object, vm_object_print_static)
 
 	db_indent += 2;
 	count = 0;
-	for (p = TAILQ_FIRST(&object->memq); p != NULL; p = TAILQ_NEXT(p, listq)) {
+	TAILQ_FOREACH(p, &object->memq, listq) {
 		if (count == 0)
 			db_iprintf("memory:=");
 		else if (count == 6) {
diff --git a/sys/vm/vm_pageout.c b/sys/vm/vm_pageout.c
index 0dd7ecbdf56d..4046e0ecbdf4 100644
--- a/sys/vm/vm_pageout.c
+++ b/sys/vm/vm_pageout.c
@@ -1463,7 +1463,7 @@ vm_daemon()
 		 */
 
 		ALLPROC_LOCK(AP_SHARED);
-		for (p = allproc.lh_first; p != 0; p = p->p_list.le_next) {
+		LIST_FOREACH(p, &allproc, p_list) {
 			vm_pindex_t limit, size;
 
 			/*
diff --git a/sys/vm/vm_pager.c b/sys/vm/vm_pager.c
index 6dbcca2a6f70..648b340afde1 100644
--- a/sys/vm/vm_pager.c
+++ b/sys/vm/vm_pager.c
@@ -329,7 +329,7 @@ vm_pager_object_lookup(pg_list, handle)
 {
 	register vm_object_t object;
 
-	for (object = TAILQ_FIRST(pg_list); object != NULL; object = TAILQ_NEXT(object,pager_object_list))
+	TAILQ_FOREACH(object, pg_list, pager_object_list)
 		if (object->handle == handle)
 			return (object);
 	return (NULL);