Index: kernel/genarch/src/mm/asid.c
===================================================================
--- kernel/genarch/src/mm/asid.c	(revision 76fca318d723e24d0c79dc1a99d87b0b03dee0f1)
+++ kernel/genarch/src/mm/asid.c	(revision a68f7375e3e4f83a6876853e429edc329d00e4e4)
@@ -66,5 +66,5 @@
 #include <debug.h>
 
-static count_t asids_allocated = 0;
+static size_t asids_allocated = 0;
 
 /** Allocate free address space identifier.
@@ -121,5 +121,5 @@
 		 * cache must be invalidated as well.
 		 */
-		as_invalidate_translation_cache(as, 0, (count_t) -1);
+		as_invalidate_translation_cache(as, 0, (size_t) -1);
 		
 		/*
Index: kernel/genarch/src/mm/page_ht.c
===================================================================
--- kernel/genarch/src/mm/page_ht.c	(revision 76fca318d723e24d0c79dc1a99d87b0b03dee0f1)
+++ kernel/genarch/src/mm/page_ht.c	(revision a68f7375e3e4f83a6876853e429edc329d00e4e4)
@@ -52,6 +52,6 @@
 #include <align.h>
 
-static index_t hash(unative_t key[]);
-static bool compare(unative_t key[], count_t keys, link_t *item);
+static size_t hash(unative_t key[]);
+static bool compare(unative_t key[], size_t keys, link_t *item);
 static void remove_callback(link_t *item);
 
@@ -94,9 +94,9 @@
  * @return Index into page hash table.
  */
-index_t hash(unative_t key[])
+size_t hash(unative_t key[])
 {
 	as_t *as = (as_t *) key[KEY_AS];
 	uintptr_t page = (uintptr_t) key[KEY_PAGE];
-	index_t index;
+	size_t index;
 	
 	/*
@@ -125,5 +125,5 @@
  * @return true on match, false otherwise.
  */
-bool compare(unative_t key[], count_t keys, link_t *item)
+bool compare(unative_t key[], size_t keys, link_t *item)
 {
 	pte_t *t;