Index: kernel/generic/src/syscall/copy.c
===================================================================
--- kernel/generic/src/syscall/copy.c	(revision 174156fd1cf321a6363777352073d05829467b2f)
+++ kernel/generic/src/syscall/copy.c	(revision 00e8290f885b3dc03a5c5a191983eb336d1e852c)
@@ -59,5 +59,5 @@
  * @return EOK on success or an error code from @ref errno.h.
  */
-errno_t copy_from_uspace(void *dst, const void *uspace_src, size_t size)
+errno_t copy_from_uspace(void *dst, uspace_addr_t uspace_src, size_t size)
 {
 	ipl_t ipl;
@@ -68,5 +68,5 @@
 
 	if (!KERNEL_ADDRESS_SPACE_SHADOWED) {
-		if (overlaps((uintptr_t) uspace_src, size,
+		if (overlaps(uspace_src, size,
 		    KERNEL_ADDRESS_SPACE_START,
 		    KERNEL_ADDRESS_SPACE_END - KERNEL_ADDRESS_SPACE_START)) {
@@ -82,5 +82,5 @@
 	 * Check whether the address is outside the address space hole.
 	 */
-	if (overlaps((uintptr_t) uspace_src, size, ADDRESS_SPACE_HOLE_START,
+	if (overlaps(uspace_src, size, ADDRESS_SPACE_HOLE_START,
 	    ADDRESS_SPACE_HOLE_END - ADDRESS_SPACE_HOLE_START))
 		return EPERM;
@@ -110,5 +110,5 @@
  * @return 0 on success or an error code from @ref errno.h.
  */
-errno_t copy_to_uspace(void *uspace_dst, const void *src, size_t size)
+errno_t copy_to_uspace(uspace_addr_t uspace_dst, const void *src, size_t size)
 {
 	ipl_t ipl;
@@ -119,5 +119,5 @@
 
 	if (!KERNEL_ADDRESS_SPACE_SHADOWED) {
-		if (overlaps((uintptr_t) uspace_dst, size,
+		if (overlaps(uspace_dst, size,
 		    KERNEL_ADDRESS_SPACE_START,
 		    KERNEL_ADDRESS_SPACE_END - KERNEL_ADDRESS_SPACE_START)) {
@@ -133,5 +133,5 @@
 	 * Check whether the address is outside the address space hole.
 	 */
-	if (overlaps((uintptr_t) uspace_dst, size, ADDRESS_SPACE_HOLE_START,
+	if (overlaps(uspace_dst, size, ADDRESS_SPACE_HOLE_START,
 	    ADDRESS_SPACE_HOLE_END - ADDRESS_SPACE_HOLE_START))
 		return EPERM;