Index: kernel/arch/amd64/src/asm.S
===================================================================
--- kernel/arch/amd64/src/asm.S	(revision 32254d6ae36aa180fa53338ca60684a9c87d7947)
+++ kernel/arch/amd64/src/asm.S	(revision e43acd38c0225c4fac18ac08d9da30ca442ef906)
@@ -73,5 +73,5 @@
 
 	0:
-		ret                 /* return MEMCPY_SRC, success */
+		ret                 /* return MEMCPY_DST, success */
 FUNCTION_END(memcpy_from_uspace)
 FUNCTION_END(memcpy_to_uspace)
Index: uspace/app/tester/mm/mapping1.c
===================================================================
--- uspace/app/tester/mm/mapping1.c	(revision 32254d6ae36aa180fa53338ca60684a9c87d7947)
+++ uspace/app/tester/mm/mapping1.c	(revision e43acd38c0225c4fac18ac08d9da30ca442ef906)
@@ -73,5 +73,6 @@
 	for (i = 0; i < page_count; i++) {
 		void *page_start = ((char *) area) + PAGE_SIZE * i;
-		errno_t rc = as_get_physical_mapping(page_start, NULL);
+		uintptr_t phys_dummy;
+		errno_t rc = as_get_physical_mapping(page_start, &phys_dummy);
 		if (rc != expected_rc) {
 			TPRINTF("as_get_physical_mapping() = %s != %s\n",