Index: kernel/test/mm/falloc2.c
===================================================================
--- kernel/test/mm/falloc2.c	(revision cd8ad523401f883e29a5bd5c6ac5d359a1a1dc53)
+++ kernel/test/mm/falloc2.c	(revision 51b966b0dcf268c204d4d2eab4bf76a0bd2268ec)
@@ -56,5 +56,5 @@
 	index_t k;
 	
-	uintptr_t * frames =  (uintptr_t *) malloc(MAX_FRAMES * sizeof(uintptr_t), FRAME_ATOMIC);
+	void **frames =  (void **) malloc(MAX_FRAMES * sizeof(void *), FRAME_ATOMIC);
 	if (frames == NULL) {
 		if (!sh_quiet)
@@ -74,5 +74,5 @@
 			allocated = 0;
 			for (i = 0; i < (MAX_FRAMES >> order); i++) {
-				frames[allocated] = (uintptr_t)frame_alloc(order, FRAME_ATOMIC | FRAME_KA);
+				frames[allocated] = frame_alloc(order, FRAME_ATOMIC | FRAME_KA);
 				if (frames[allocated]) {
 					memsetb(frames[allocated], FRAME_SIZE << order, val);
Index: kernel/test/mm/slab1.c
===================================================================
--- kernel/test/mm/slab1.c	(revision cd8ad523401f883e29a5bd5c6ac5d359a1a1dc53)
+++ kernel/test/mm/slab1.c	(revision 51b966b0dcf268c204d4d2eab4bf76a0bd2268ec)
@@ -54,5 +54,5 @@
 	for (i = 0; i < count; i++) {
 		data[i] = slab_alloc(cache, 0);
-		memsetb((uintptr_t) data[i], size, 0);
+		memsetb(data[i], size, 0);
 	}
 	
@@ -72,5 +72,5 @@
 	for (i = 0; i < count; i++) {
 		data[i] = slab_alloc(cache, 0);
-		memsetb((uintptr_t) data[i], size, 0);
+		memsetb(data[i], size, 0);
 	}
 	
@@ -90,5 +90,5 @@
 	for (i = count / 2; i < count; i++) {
 		data[i] = slab_alloc(cache, 0);
-		memsetb((uintptr_t) data[i], size, 0);
+		memsetb(data[i], size, 0);
 	}
 	
Index: kernel/test/mm/slab2.c
===================================================================
--- kernel/test/mm/slab2.c	(revision cd8ad523401f883e29a5bd5c6ac5d359a1a1dc53)
+++ kernel/test/mm/slab2.c	(revision 51b966b0dcf268c204d4d2eab4bf76a0bd2268ec)
@@ -69,6 +69,6 @@
 			break;
 		}
-		memsetb((uintptr_t) data1, ITEM_SIZE, 0);
-		memsetb((uintptr_t) data2, ITEM_SIZE, 0);
+		memsetb(data1, ITEM_SIZE, 0);
+		memsetb(data2, ITEM_SIZE, 0);
 		*((void **) data1) = olddata1;
 		*((void **) data2) = olddata2;
@@ -101,5 +101,5 @@
 			return;
 		}
-		memsetb((uintptr_t) data1, ITEM_SIZE, 0);
+		memsetb(data1, ITEM_SIZE, 0);
 		*((void **) data1) = olddata1;
 		olddata1 = data1;
@@ -109,5 +109,5 @@
 		if (!data1)
 			break;
-		memsetb((uintptr_t) data1, ITEM_SIZE, 0);
+		memsetb(data1, ITEM_SIZE, 0);
 		*((void **) data1) = olddata1;
 		olddata1 = data1;