Changeset 371bd7d in mainline for kernel/arch/arm32/src/mm/page.c

Timestamp:

2010-03-27T09:22:17Z (16 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

36a75a2

Parents:

cd82bb1 (diff), eaf22d4 (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/arm32/src/mm/page.c (modified) (2 diffs)

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

@@ -41 +41 @@
 #include <arch/exception.h>
 #include <typedefs.h>
-#include <arch/types.h>
 #include <interrupt.h>
 #include <arch/mm/frame.h>
@@ -88 +87 @@
             KA2PA(KERNEL_ADDRESS_SPACE_END_ARCH)) {
                 panic("Unable to map physical memory %p (%d bytes).",
-                    physaddr, size)
+                    physaddr, size);
         }