Changeset 513857c in mainline

Timestamp:

2025-02-20T21:11:25Z (32 hours ago)

Author:

GitHub <noreply@…>

Parents:

32254d6 (diff), e43acd3 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Roman <40754203+BohdanQQ@…> (2025-02-20 21:11:25)

git-committer:

GitHub <noreply@…> (2025-02-20 21:11:25)

Message:

Merge e43acd38c0225c4fac18ac08d9da30ca442ef906 into 32254d6ae36aa180fa53338ca60684a9c87d7947

Files:

• kernel/arch/amd64/src/asm.S (modified) (1 diff)
• uspace/app/tester/mm/mapping1.c (modified) (1 diff)

kernel/arch/amd64/src/asm.S

@@ -73 +73 @@
 
         0:
-                ret                 /* return MEMCPY_SRC, success */
+                ret                 /* return MEMCPY_DST, success */
 FUNCTION_END(memcpy_from_uspace)
 FUNCTION_END(memcpy_to_uspace)

uspace/app/tester/mm/mapping1.c

@@ -73 +73 @@
         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",