Index: kernel/generic/src/adt/hash_table.c
===================================================================
--- kernel/generic/src/adt/hash_table.c	(revision b014e9f8dfc796df22c985c021ea0869071a9d5a)
+++ kernel/generic/src/adt/hash_table.c	(revision 8bfe48e81c36cb4f2aef628c058c67d0583b320b)
@@ -52,7 +52,7 @@
  * @param op Hash table operations structure.
  */
-void hash_table_create(hash_table_t *h, count_t m, count_t max_keys, hash_table_operations_t *op)
+void hash_table_create(hash_table_t *h, size_t m, size_t max_keys, hash_table_operations_t *op)
 {
-	index_t i;
+	size_t i;
 
 	ASSERT(h);
@@ -84,5 +84,5 @@
 void hash_table_insert(hash_table_t *h, unative_t key[], link_t *item)
 {
-	index_t chain;
+	size_t chain;
 	
 	ASSERT(item);
@@ -108,5 +108,5 @@
 {
 	link_t *cur;
-	index_t chain;
+	size_t chain;
 	
 	ASSERT(h);
@@ -138,7 +138,7 @@
  * @param keys Number of keys in the key array.
  */
-void hash_table_remove(hash_table_t *h, unative_t key[], count_t keys)
+void hash_table_remove(hash_table_t *h, unative_t key[], size_t keys)
 {
-	index_t chain;
+	size_t chain;
 	link_t *cur;