--- sys/gnu/gcov/gcov_fs.c	(revision 350626)
+++ sys/gnu/gcov/gcov_fs.c	(working copy)
@@ -423,13 +423,11 @@ 
 	struct gcov_node *node;
 
 	mtx_lock(&node_lock);
- restart:
-	LIST_FOREACH(node, &all_head, all_entry) {
+	LIST_FOREACH_SAFE(node, &all_head, all_entry) {
 		if (node->num_loaded > 0)
 			reset_node(node);
 		else if (LIST_EMPTY(&node->children)) {
 			remove_node(node);
-			goto restart;
 		}
 	}
 	mtx_unlock(&node_lock);