Index: kernel/arch/ia64/include/mm/page.h
===================================================================
--- kernel/arch/ia64/include/mm/page.h	(revision e49e2348e7647a4dd4d4e2879082790396c4f4f3)
+++ kernel/arch/ia64/include/mm/page.h	(revision 99272a380ff885480a8f252b2e013a3ef7216b14)
@@ -241,5 +241,5 @@
  * @return Current contents of rr[i].
  */
-static inline uint64_t rr_read(index_t i)
+static inline uint64_t rr_read(size_t i)
 {
 	uint64_t ret;
@@ -254,5 +254,5 @@
  * @param v Value to be written to rr[i].
  */
-static inline void rr_write(index_t i, uint64_t v)
+static inline void rr_write(size_t i, uint64_t v)
 {
 	ASSERT(i < REGION_REGISTERS);
Index: kernel/arch/ia64/include/mm/tlb.h
===================================================================
--- kernel/arch/ia64/include/mm/tlb.h	(revision e49e2348e7647a4dd4d4e2879082790396c4f4f3)
+++ kernel/arch/ia64/include/mm/tlb.h	(revision 99272a380ff885480a8f252b2e013a3ef7216b14)
@@ -77,10 +77,10 @@
 extern void itc_mapping_insert(uintptr_t va, asid_t asid, tlb_entry_t entry);
 
-extern void tr_mapping_insert(uintptr_t va, asid_t asid, tlb_entry_t entry, bool dtr, index_t tr);
-extern void dtr_mapping_insert(uintptr_t va, asid_t asid, tlb_entry_t entry, index_t tr);
-extern void itr_mapping_insert(uintptr_t va, asid_t asid, tlb_entry_t entry, index_t tr);
+extern void tr_mapping_insert(uintptr_t va, asid_t asid, tlb_entry_t entry, bool dtr, size_t tr);
+extern void dtr_mapping_insert(uintptr_t va, asid_t asid, tlb_entry_t entry, size_t tr);
+extern void itr_mapping_insert(uintptr_t va, asid_t asid, tlb_entry_t entry, size_t tr);
 
-extern void dtlb_kernel_mapping_insert(uintptr_t page, uintptr_t frame, bool dtr, index_t tr);
-extern void dtr_purge(uintptr_t page, count_t width);
+extern void dtlb_kernel_mapping_insert(uintptr_t page, uintptr_t frame, bool dtr, size_t tr);
+extern void dtr_purge(uintptr_t page, size_t width);
 
 extern void dtc_pte_copy(pte_t *t);