Index: kernel/arch/amd64/include/memstr.h
===================================================================
--- kernel/arch/amd64/include/memstr.h	(revision 32443b0b118c5c83d2c933b59a696bad00c9c1ca)
+++ kernel/arch/amd64/include/memstr.h	(revision eb1c0a37580b25a6046c2480a2cef05c730f5a10)
@@ -38,8 +38,8 @@
 #define memcpy(dst, src, cnt)  __builtin_memcpy((dst), (src), (cnt))
 
-extern void memsetw(uintptr_t dst, size_t cnt, uint16_t x);
-extern void memsetb(uintptr_t dst, size_t cnt, uint8_t x);
+extern void memsetw(void *dst, size_t cnt, uint16_t x);
+extern void memsetb(void *dst, size_t cnt, uint8_t x);
 
-extern int memcmp(uintptr_t src, uintptr_t dst, int cnt);
+extern int memcmp(const void *a, const void *b, size_t cnt);
 
 #endif
Index: kernel/arch/amd64/src/pm.c
===================================================================
--- kernel/arch/amd64/src/pm.c	(revision 32443b0b118c5c83d2c933b59a696bad00c9c1ca)
+++ kernel/arch/amd64/src/pm.c	(revision eb1c0a37580b25a6046c2480a2cef05c730f5a10)
@@ -156,5 +156,5 @@
 void tss_initialize(tss_t *t)
 {
-	memsetb((uintptr_t) t, sizeof(tss_t), 0);
+	memsetb(t, sizeof(tss_t), 0);
 }
 
@@ -240,5 +240,5 @@
 	ipl_t ipl = interrupts_disable();
 	
-	memsetb((uintptr_t) idt, sizeof(idt), 0);
+	memsetb(idt, sizeof(idt), 0);
 	idtr_load(&idtr);
 	
Index: kernel/arch/arm32/include/memstr.h
===================================================================
--- kernel/arch/arm32/include/memstr.h	(revision 32443b0b118c5c83d2c933b59a696bad00c9c1ca)
+++ kernel/arch/arm32/include/memstr.h	(revision eb1c0a37580b25a6046c2480a2cef05c730f5a10)
@@ -39,8 +39,8 @@
 #define memcpy(dst, src, cnt)  __builtin_memcpy((dst), (src), (cnt))
 
-extern void memsetw(uintptr_t dst, size_t cnt, uint16_t x);
-extern void memsetb(uintptr_t dst, size_t cnt, uint8_t x);
+extern void memsetw(void *dst, size_t cnt, uint16_t x);
+extern void memsetb(void *dst, size_t cnt, uint8_t x);
 
-extern int memcmp(uintptr_t src, uintptr_t dst, int cnt);
+extern int memcmp(const void *a, const void *b, size_t cnt);
 
 #endif
Index: kernel/arch/ia32/include/memstr.h
===================================================================
--- kernel/arch/ia32/include/memstr.h	(revision 32443b0b118c5c83d2c933b59a696bad00c9c1ca)
+++ kernel/arch/ia32/include/memstr.h	(revision eb1c0a37580b25a6046c2480a2cef05c730f5a10)
@@ -38,8 +38,8 @@
 #define memcpy(dst, src, cnt)  __builtin_memcpy((dst), (src), (cnt))
 
-extern void memsetw(uintptr_t dst, size_t cnt, uint16_t x);
-extern void memsetb(uintptr_t dst, size_t cnt, uint8_t x);
+extern void memsetw(void *dst, size_t cnt, uint16_t x);
+extern void memsetb(void *dst, size_t cnt, uint8_t x);
 
-extern int memcmp(uintptr_t src, uintptr_t dst, int cnt);
+extern int memcmp(const void *a, const void *b, size_t cnt);
 
 #endif
Index: kernel/arch/ia32/src/drivers/ega.c
===================================================================
--- kernel/arch/ia32/src/drivers/ega.c	(revision 32443b0b118c5c83d2c933b59a696bad00c9c1ca)
+++ kernel/arch/ia32/src/drivers/ega.c	(revision eb1c0a37580b25a6046c2480a2cef05c730f5a10)
@@ -116,5 +116,5 @@
 
 	memcpy((void *) videoram, (void *) (videoram + ROW * 2), (SCREEN - ROW) * 2);
-	memsetw((uintptr_t) (videoram + (SCREEN - ROW) * 2), ROW, 0x0720);
+	memsetw(videoram + (SCREEN - ROW) * 2, ROW, 0x0720);
 	ega_cursor = ega_cursor - ROW;
 }
Index: kernel/arch/ia32/src/pm.c
===================================================================
--- kernel/arch/ia32/src/pm.c	(revision 32443b0b118c5c83d2c933b59a696bad00c9c1ca)
+++ kernel/arch/ia32/src/pm.c	(revision eb1c0a37580b25a6046c2480a2cef05c730f5a10)
@@ -113,5 +113,5 @@
 void tss_initialize(tss_t *t)
 {
-	memsetb((uintptr_t) t, sizeof(struct tss), 0);
+	memsetb(t, sizeof(struct tss), 0);
 }
 
@@ -241,5 +241,5 @@
 	ipl_t ipl = interrupts_disable();
 	
-	memsetb((uintptr_t) idt, sizeof(idt), 0);
+	memsetb(idt, sizeof(idt), 0);
 	
 	ptr_16_32_t idtr;
Index: kernel/arch/ia32/src/smp/smp.c
===================================================================
--- kernel/arch/ia32/src/smp/smp.c	(revision 32443b0b118c5c83d2c933b59a696bad00c9c1ca)
+++ kernel/arch/ia32/src/smp/smp.c	(revision eb1c0a37580b25a6046c2480a2cef05c730f5a10)
@@ -161,6 +161,5 @@
 
 		memcpy(gdt_new, gdt, GDT_ITEMS * sizeof(struct descriptor));
-		memsetb((uintptr_t)(&gdt_new[TSS_DES]),
-		    sizeof(struct descriptor), 0);
+		memsetb(&gdt_new[TSS_DES], sizeof(struct descriptor), 0);
 		protected_ap_gdtr.limit = GDT_ITEMS * sizeof(struct descriptor);
 		protected_ap_gdtr.base = KA2PA((uintptr_t) gdt_new);
Index: kernel/arch/ia32xen/src/ia32xen.c
===================================================================
--- kernel/arch/ia32xen/src/ia32xen.c	(revision 32443b0b118c5c83d2c933b59a696bad00c9c1ca)
+++ kernel/arch/ia32xen/src/ia32xen.c	(revision eb1c0a37580b25a6046c2480a2cef05c730f5a10)
@@ -70,5 +70,5 @@
 {
 	pte_t pte;
-	memsetb((uintptr_t) &pte, sizeof(pte), 0);
+	memsetb(&pte, sizeof(pte), 0);
 	
 	pte.present = 1;
@@ -104,5 +104,5 @@
 			uintptr_t tva = PA2KA(tpa);
 			
-			memsetb(tva, PAGE_SIZE, 0);
+			memsetb((void *) tva, PAGE_SIZE, 0);
 			
 			pte_t *tptl3 = (pte_t *) PA2KA(GET_PTL1_ADDRESS(start_info.ptl0, PTL0_INDEX(tva)));
Index: kernel/arch/ia32xen/src/pm.c
===================================================================
--- kernel/arch/ia32xen/src/pm.c	(revision 32443b0b118c5c83d2c933b59a696bad00c9c1ca)
+++ kernel/arch/ia32xen/src/pm.c	(revision eb1c0a37580b25a6046c2480a2cef05c730f5a10)
@@ -99,5 +99,5 @@
 void tss_initialize(tss_t *t)
 {
-	memsetb((uintptr_t) t, sizeof(struct tss), 0);
+	memsetb(t, sizeof(struct tss), 0);
 }
 
Index: kernel/arch/ia32xen/src/smp/smp.c
===================================================================
--- kernel/arch/ia32xen/src/smp/smp.c	(revision 32443b0b118c5c83d2c933b59a696bad00c9c1ca)
+++ kernel/arch/ia32xen/src/smp/smp.c	(revision eb1c0a37580b25a6046c2480a2cef05c730f5a10)
@@ -147,5 +147,5 @@
 
 		memcpy(gdt_new, gdt, GDT_ITEMS * sizeof(struct descriptor));
-		memsetb((uintptr_t)(&gdt_new[TSS_DES]), sizeof(struct descriptor), 0);
+		memsetb(&gdt_new[TSS_DES], sizeof(struct descriptor), 0);
 		gdtr.base = (uintptr_t) gdt_new;
 
Index: kernel/arch/ia64/include/memstr.h
===================================================================
--- kernel/arch/ia64/include/memstr.h	(revision 32443b0b118c5c83d2c933b59a696bad00c9c1ca)
+++ kernel/arch/ia64/include/memstr.h	(revision eb1c0a37580b25a6046c2480a2cef05c730f5a10)
@@ -38,8 +38,8 @@
 #define memcpy(dst, src, cnt)  __builtin_memcpy((dst), (src), (cnt))
 
-extern void memsetw(uintptr_t dst, size_t cnt, uint16_t x);
-extern void memsetb(uintptr_t dst, size_t cnt, uint8_t x);
+extern void memsetw(void *dst, size_t cnt, uint16_t x);
+extern void memsetb(void *dst, size_t cnt, uint8_t x);
 
-extern int memcmp(uintptr_t src, uintptr_t dst, int cnt);
+extern int memcmp(const void *a, const void *b, size_t cnt);
 
 #endif
Index: kernel/arch/ia64/src/drivers/ega.c
===================================================================
--- kernel/arch/ia64/src/drivers/ega.c	(revision 32443b0b118c5c83d2c933b59a696bad00c9c1ca)
+++ kernel/arch/ia64/src/drivers/ega.c	(revision eb1c0a37580b25a6046c2480a2cef05c730f5a10)
@@ -72,5 +72,5 @@
 	 * Clear the screen.
 	 */
-	_memsetw((uintptr_t) videoram, SCREEN, 0x0720);	
+	_memsetw(videoram, SCREEN, 0x0720);	
 
 	chardev_initialize("ega_out", &ega_console, &ega_ops);
@@ -103,5 +103,5 @@
 
 	memcpy((void *) videoram, (void *) (videoram + ROW * 2), (SCREEN - ROW) * 2);
-	_memsetw((uintptr_t) (videoram + (SCREEN - ROW) * 2), ROW, 0x0720);
+	_memsetw(videoram + (SCREEN - ROW) * 2, ROW, 0x0720);
 	ega_cursor = ega_cursor - ROW;
 }
Index: kernel/arch/ia64/src/mm/vhpt.c
===================================================================
--- kernel/arch/ia64/src/mm/vhpt.c	(revision 32443b0b118c5c83d2c933b59a696bad00c9c1ca)
+++ kernel/arch/ia64/src/mm/vhpt.c	(revision eb1c0a37580b25a6046c2480a2cef05c730f5a10)
@@ -82,5 +82,5 @@
 void vhpt_invalidate_all()
 {
-	memsetb((uintptr_t) vhpt_base, 1 << VHPT_WIDTH, 0);
+	memsetb(vhpt_base, 1 << VHPT_WIDTH, 0);
 }
 
Index: kernel/arch/mips32/include/memstr.h
===================================================================
--- kernel/arch/mips32/include/memstr.h	(revision 32443b0b118c5c83d2c933b59a696bad00c9c1ca)
+++ kernel/arch/mips32/include/memstr.h	(revision eb1c0a37580b25a6046c2480a2cef05c730f5a10)
@@ -38,8 +38,8 @@
 #define memcpy(dst, src, cnt)  __builtin_memcpy((dst), (src), (cnt))
 
-extern void memsetw(uintptr_t dst, size_t cnt, uint16_t x);
-extern void memsetb(uintptr_t dst, size_t cnt, uint8_t x);
+extern void memsetw(void *dst, size_t cnt, uint16_t x);
+extern void memsetb(void *dst, size_t cnt, uint8_t x);
 
-extern int memcmp(uintptr_t src, uintptr_t dst, int cnt);
+extern int memcmp(const void *a, const void *b, size_t cnt);
 
 #endif
Index: kernel/arch/ppc32/include/memstr.h
===================================================================
--- kernel/arch/ppc32/include/memstr.h	(revision 32443b0b118c5c83d2c933b59a696bad00c9c1ca)
+++ kernel/arch/ppc32/include/memstr.h	(revision eb1c0a37580b25a6046c2480a2cef05c730f5a10)
@@ -38,8 +38,8 @@
 #define memcpy(dst, src, cnt)  __builtin_memcpy((dst), (src), (cnt))
 
-extern void memsetw(uintptr_t dst, size_t cnt, uint16_t x);
-extern void memsetb(uintptr_t dst, size_t cnt, uint8_t x);
+extern void memsetw(void *dst, size_t cnt, uint16_t x);
+extern void memsetb(void *dst, size_t cnt, uint8_t x);
 
-extern int memcmp(uintptr_t src, uintptr_t dst, int cnt);
+extern int memcmp(const void *a, const void *b, size_t cnt);
 
 #endif
Index: kernel/arch/ppc64/include/memstr.h
===================================================================
--- kernel/arch/ppc64/include/memstr.h	(revision 32443b0b118c5c83d2c933b59a696bad00c9c1ca)
+++ kernel/arch/ppc64/include/memstr.h	(revision eb1c0a37580b25a6046c2480a2cef05c730f5a10)
@@ -38,8 +38,8 @@
 #define memcpy(dst, src, cnt)  __builtin_memcpy((dst), (src), (cnt))
 
-extern void memsetw(uintptr_t dst, size_t cnt, uint16_t x);
-extern void memsetb(uintptr_t dst, size_t cnt, uint8_t x);
+extern void memsetw(void *dst, size_t cnt, uint16_t x);
+extern void memsetb(void *dst, size_t cnt, uint8_t x);
 
-extern int memcmp(uintptr_t src, uintptr_t dst, int cnt);
+extern int memcmp(const void *a, const void *b, size_t cnt);
 
 #endif
Index: kernel/arch/ppc64/src/mm/page.c
===================================================================
--- kernel/arch/ppc64/src/mm/page.c	(revision 32443b0b118c5c83d2c933b59a696bad00c9c1ca)
+++ kernel/arch/ppc64/src/mm/page.c	(revision eb1c0a37580b25a6046c2480a2cef05c730f5a10)
@@ -253,5 +253,5 @@
 void pht_init(void)
 {
-	memsetb((uintptr_t) phte, 1 << PHT_BITS, 0);
+	memsetb(phte, 1 << PHT_BITS, 0);
 }
 
Index: kernel/arch/sparc64/include/memstr.h
===================================================================
--- kernel/arch/sparc64/include/memstr.h	(revision 32443b0b118c5c83d2c933b59a696bad00c9c1ca)
+++ kernel/arch/sparc64/include/memstr.h	(revision eb1c0a37580b25a6046c2480a2cef05c730f5a10)
@@ -38,8 +38,8 @@
 #define memcpy(dst, src, cnt)  __builtin_memcpy((dst), (src), (cnt))
 
-extern void memsetw(uintptr_t dst, size_t cnt, uint16_t x);
-extern void memsetb(uintptr_t dst, size_t cnt, uint8_t x);
+extern void memsetw(void *dst, size_t cnt, uint16_t x);
+extern void memsetb(void *dst, size_t cnt, uint8_t x);
 
-extern int memcmp(uintptr_t src, uintptr_t dst, int cnt);
+extern int memcmp(const void *a, const void *b, size_t cnt);
 
 #endif
Index: kernel/arch/sparc64/src/mm/as.c
===================================================================
--- kernel/arch/sparc64/src/mm/as.c	(revision 32443b0b118c5c83d2c933b59a696bad00c9c1ca)
+++ kernel/arch/sparc64/src/mm/as.c	(revision eb1c0a37580b25a6046c2480a2cef05c730f5a10)
@@ -77,5 +77,5 @@
 	    sizeof(tsb_entry_t));
 
-	memsetb((uintptr_t) as->arch.itsb,
+	memsetb(as->arch.itsb,
 	    (ITSB_ENTRY_COUNT + DTSB_ENTRY_COUNT) * sizeof(tsb_entry_t), 0);
 #endif