Index: kernel/arch/ia64/include/mm/page.h
===================================================================
--- kernel/arch/ia64/include/mm/page.h	(revision 66b430e944e6d961737fe54f174087033a3dd64c)
+++ kernel/arch/ia64/include/mm/page.h	(revision 98000fb4ea6015506f059c9b121e417ce991ecfd)
@@ -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 66b430e944e6d961737fe54f174087033a3dd64c)
+++ kernel/arch/ia64/include/mm/tlb.h	(revision 98000fb4ea6015506f059c9b121e417ce991ecfd)
@@ -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);
Index: kernel/arch/ia64/include/types.h
===================================================================
--- kernel/arch/ia64/include/types.h	(revision 66b430e944e6d961737fe54f174087033a3dd64c)
+++ kernel/arch/ia64/include/types.h	(revision 98000fb4ea6015506f059c9b121e417ce991ecfd)
@@ -55,6 +55,4 @@
 
 typedef uint64_t size_t;
-typedef uint64_t count_t;
-typedef uint64_t index_t;
 
 typedef uint64_t uintptr_t;
@@ -73,6 +71,4 @@
 #define PRIp "lx"	/**< Format for uintptr_t. */
 #define PRIs "lu"	/**< Format for size_t. */
-#define PRIc "lu"	/**< Format for count_t. */
-#define PRIi "lu"	/**< Format for index_t. */
 
 #define PRId8 "d"	/**< Format for int8_t. */
Index: kernel/arch/ia64/src/mm/page.c
===================================================================
--- kernel/arch/ia64/src/mm/page.c	(revision 66b430e944e6d961737fe54f174087033a3dd64c)
+++ kernel/arch/ia64/src/mm/page.c	(revision 98000fb4ea6015506f059c9b121e417ce991ecfd)
@@ -132,5 +132,5 @@
 {
 	region_register rr_save, rr;
-	index_t vrn;
+	size_t vrn;
 	rid_t rid;
 	vhpt_entry_t *v;
@@ -177,5 +177,5 @@
 {
 	region_register rr_save, rr;	
-	index_t vrn;
+	size_t vrn;
 	rid_t rid;
 	bool match;
@@ -224,5 +224,5 @@
 {
 	region_register rr_save, rr;	
-	index_t vrn;
+	size_t vrn;
 	rid_t rid;
 	uint64_t tag;
Index: kernel/arch/ia64/src/mm/tlb.c
===================================================================
--- kernel/arch/ia64/src/mm/tlb.c	(revision 66b430e944e6d961737fe54f174087033a3dd64c)
+++ kernel/arch/ia64/src/mm/tlb.c	(revision 98000fb4ea6015506f059c9b121e417ce991ecfd)
@@ -101,5 +101,5 @@
 
 
-void tlb_invalidate_pages(asid_t asid, uintptr_t page, count_t cnt)
+void tlb_invalidate_pages(asid_t asid, uintptr_t page, size_t cnt)
 {
 	region_register rr;
@@ -268,5 +268,5 @@
  */
 void
-itr_mapping_insert(uintptr_t va, asid_t asid, tlb_entry_t entry, index_t tr)
+itr_mapping_insert(uintptr_t va, asid_t asid, tlb_entry_t entry, size_t tr)
 {
 	tr_mapping_insert(va, asid, entry, false, tr);
@@ -282,5 +282,5 @@
  */
 void
-dtr_mapping_insert(uintptr_t va, asid_t asid, tlb_entry_t entry, index_t tr)
+dtr_mapping_insert(uintptr_t va, asid_t asid, tlb_entry_t entry, size_t tr)
 {
 	tr_mapping_insert(va, asid, entry, true, tr);
@@ -299,5 +299,5 @@
 void
 tr_mapping_insert(uintptr_t va, asid_t asid, tlb_entry_t entry, bool dtr,
-    index_t tr)
+    size_t tr)
 {
 	region_register rr;
@@ -354,5 +354,5 @@
 void
 dtlb_kernel_mapping_insert(uintptr_t page, uintptr_t frame, bool dtr,
-    index_t tr)
+    size_t tr)
 {
 	tlb_entry_t entry;
@@ -383,5 +383,5 @@
  * @param width		Width of the purge in bits.
  */
-void dtr_purge(uintptr_t page, count_t width)
+void dtr_purge(uintptr_t page, size_t width)
 {
 	asm volatile ("ptr.d %0, %1\n" : : "r" (page), "r" (width << 2));
Index: kernel/arch/ia64/src/mm/vhpt.c
===================================================================
--- kernel/arch/ia64/src/mm/vhpt.c	(revision 66b430e944e6d961737fe54f174087033a3dd64c)
+++ kernel/arch/ia64/src/mm/vhpt.c	(revision 98000fb4ea6015506f059c9b121e417ce991ecfd)
@@ -54,5 +54,5 @@
 {
 	region_register rr_save, rr;
-	index_t vrn;
+	size_t vrn;
 	rid_t rid;
 	uint64_t tag;