Index: kernel/generic/src/adt/btree.c
===================================================================
--- kernel/generic/src/adt/btree.c	(revision 15819e3721b214ac8d8e1b9270bd032b691b3e41)
+++ kernel/generic/src/adt/btree.c	(revision 7d307e7eb5d053d50790e7d16579cd967348f4b3)
@@ -138,5 +138,5 @@
 void btree_destroy_subtree(btree_node_t *root)
 {
-	int i;
+	count_t i;
 
 	if (root->keys) {
@@ -270,5 +270,5 @@
 	
 	if (node->keys > FILL_FACTOR) {
-		int i;
+		count_t i;
 
 		/*
@@ -336,5 +336,5 @@
 		} else {
 			void *val;
-			int i;
+			count_t i;
 		
 			/*
@@ -443,9 +443,9 @@
 void node_insert_key_and_lsubtree(btree_node_t *node, btree_key_t key, void *value, btree_node_t *lsubtree)
 {
-	int i;
+	count_t i;
 
 	for (i = 0; i < node->keys; i++) {
 		if (key < node->key[i]) {
-			int j;
+			count_t j;
 		
 			for (j = node->keys; j > i; j--) {
@@ -479,9 +479,9 @@
 void node_insert_key_and_rsubtree(btree_node_t *node, btree_key_t key, void *value, btree_node_t *rsubtree)
 {
-	int i;
+	count_t i;
 
 	for (i = 0; i < node->keys; i++) {
 		if (key < node->key[i]) {
-			int j;
+			count_t j;
 		
 			for (j = node->keys; j > i; j--) {
@@ -511,5 +511,5 @@
 void node_remove_key_and_lsubtree(btree_node_t *node, btree_key_t key)
 {
-	int i, j;
+	count_t i, j;
 	
 	for (i = 0; i < node->keys; i++) {
@@ -539,5 +539,5 @@
 void node_remove_key_and_rsubtree(btree_node_t *node, btree_key_t key)
 {
-	int i, j;
+	count_t i, j;
 	
 	for (i = 0; i < node->keys; i++) {
@@ -577,5 +577,5 @@
 {
 	btree_node_t *rnode;
-	int i, j;
+	count_t i, j;
 
 	ASSERT(median);
@@ -604,5 +604,5 @@
 	 * If this is an index node, do not copy the median.
 	 */
-	i = (int) INDEX_NODE(node);
+	i = (count_t) INDEX_NODE(node);
 	for (i += MEDIAN_HIGH_INDEX(node), j = 0; i < node->keys; i++, j++) {
 		rnode->key[j] = node->key[i];
@@ -639,5 +639,5 @@
 	index_t idx;
 	btree_node_t *rnode;
-	int i;
+	count_t i;
 
 	ASSERT(!ROOT_NODE(node));
@@ -688,5 +688,5 @@
 index_t find_key_by_subtree(btree_node_t *node, btree_node_t *subtree, bool right)
 {
-	int i;
+	count_t i;
 	
 	for (i = 0; i < node->keys + 1; i++) {
@@ -941,5 +941,6 @@
 void btree_print(btree_t *t)
 {
-	int i, depth = t->root->depth;
+	count_t i;
+	int depth = t->root->depth;
 	link_t head, *cur;