Changeset 84439d7 in mainline for kernel/arch/amd64/src/mm/page.c

Timestamp:

2010-12-05T09:34:46Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

75732da

Parents:

56b962d (diff), 35537a7 (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.

Message:

Merge with development/

File:

• kernel/arch/amd64/src/mm/page.c (modified) (2 diffs)

kernel/arch/amd64/src/mm/page.c

@@ -89 +89 @@
         
         if (as_page_fault(page, access, istate) == AS_PF_FAULT) {
-                fault_if_from_uspace(istate, "Page fault: %#x.", page);
+                fault_if_from_uspace(istate, "Page fault: %p.", (void *) page);
                 panic_memtrap(istate, access, page, NULL);
         }
@@ -97 +97 @@
 {
         if (last_frame + ALIGN_UP(size, PAGE_SIZE) > KA2PA(KERNEL_ADDRESS_SPACE_END_ARCH))
-                panic("Unable to map physical memory %p (%" PRIs " bytes).", physaddr,
-                    size);
+                panic("Unable to map physical memory %p (%zu bytes).",
+                    (void *) physaddr, size);
         
         uintptr_t virtaddr = PA2KA(last_frame);