diff --git a/sys/kern/subr_rangeset.c b/sys/kern/subr_rangeset.c
--- a/sys/kern/subr_rangeset.c
+++ b/sys/kern/subr_rangeset.c
@@ -232,18 +232,20 @@
 	return (rangeset_remove_pred(rs, start, end, rangeset_true_pred));
 }
 
+static void
+rangeset_remove_leaf(void *rv, void *rsv)
+{
+	struct rs_el *r = rv;
+	struct rangeset *rs = rsv;
+
+	rs->rs_free_data(rs->rs_data_ctx, r);
+}
+
 void
 rangeset_remove_all(struct rangeset *rs)
 {
-	struct rs_el *r;
-
-	for (;;) {
-		r = RANGESET_PCTRIE_LOOKUP_GE(&rs->rs_trie, 0);
-		if (r == NULL)
-			break;
-		RANGESET_PCTRIE_REMOVE(&rs->rs_trie, r->re_start);
-		rs->rs_free_data(rs->rs_data_ctx, r);
-	}
+	RANGESET_PCTRIE_RECLAIM_CALLBACK(&rs->rs_trie,
+	    rangeset_remove_leaf, rs);
 }
 
 void *