Changeset 89c57b6 in mainline for kernel/arch/ia32/src/mm/page.c

Timestamp:

2011-04-13T14:45:41Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

88634420

Parents:

cefb126 (diff), 17279ead (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 mainline changes.

File:

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

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

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