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

Timestamp:

2011-04-13T14:45:41Z (13 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/arm32/src/mm/page.c (modified) (3 diffs)

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

@@ -58 +58 @@
         uintptr_t cur;
         /* Kernel identity mapping */
-        for (cur = 0; cur < last_frame; cur += FRAME_SIZE)
+        for (cur = PHYSMEM_START_ADDR; cur < last_frame; cur += FRAME_SIZE)
                 page_mapping_insert(AS_KERNEL, PA2KA(cur), cur, flags);
         
@@ -68 +68 @@
 #error "Only high exception vector supported now"
 #endif
+        cur = ALIGN_DOWN(0x50008010, FRAME_SIZE);
+        page_mapping_insert(AS_KERNEL, PA2KA(cur), cur, flags);
 
         page_table_unlock(AS_KERNEL, true);
@@ -91 +93 @@
             KA2PA(KERNEL_ADDRESS_SPACE_END_ARCH)) {
                 panic("Unable to map physical memory %p (%d bytes).",
-                    physaddr, size);
+                    (void *) physaddr, size);
         }