Changeset 25eec4e in mainline for kernel/arch/arm32/src/mm/page.c

Timestamp:

2013-04-19T18:38:18Z (12 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

6d717a4

Parents:

a1e2df13 (diff), 289cb7dd (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 chages.

File:

• kernel/arch/arm32/src/mm/page.c (modified) (1 diff)

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

@@ -52 +52 @@
 void page_arch_init(void)
 {
-        int flags = PAGE_CACHEABLE;
+        int flags = PAGE_CACHEABLE | PAGE_EXEC;
         page_mapping_operations = &pt_mapping_operations;
 
         page_table_lock(AS_KERNEL, true);
         
-        uintptr_t cur;
-
         /* Kernel identity mapping */
-        for (cur = PHYSMEM_START_ADDR;
-            cur < min(config.identity_size, config.physmem_end);
+        //FIXME: We need to consider the possibility that
+        //identity_base > identity_size and physmem_end.
+        //This might lead to overflow if identity_size is too big.
+        for (uintptr_t cur = PHYSMEM_START_ADDR;
+            cur < min(KA2PA(config.identity_base) +
+                config.identity_size, config.physmem_end);
             cur += FRAME_SIZE)
                 page_mapping_insert(AS_KERNEL, PA2KA(cur), cur, flags);