Changeset 61c0402 in mainline for kernel/arch/ia32/src/mm/page.c

Timestamp:

2010-01-15T19:36:53Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

92bee46

Parents:

50f9c3a (diff), 963462af (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) (1 diff)

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

@@ -80 +80 @@
 {
         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 (%d bytes).", physaddr, size);
         
         uintptr_t virtaddr = PA2KA(last_frame);