Changeset af2a76c in mainline for kernel/genarch/src/mm/page_pt.c

Timestamp:

2014-07-13T17:25:15Z (11 years ago)

Author:

Agnieszka Tabaka <nufcia@…>

Branches:

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

Children:

7493e7b

Parents:

b8e75319 (diff), 78192cc7 (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/genarch/src/mm/page_pt.c (modified) (1 diff)

kernel/genarch/src/mm/page_pt.c

@@ -384 +384 @@
             addr - 1 < base + size - 1;
             addr += ptl0_step) {
+                if (GET_PTL1_ADDRESS(ptl0, PTL0_INDEX(addr))) {
+                        ASSERT(overlaps(addr, ptl0_step,
+                            config.identity_base, config.identity_size));
+
+                        /*
+                         * This PTL0 entry also maps the kernel identity region,
+                         * so it is already global and initialized.
+                         */
+                        continue;
+                }
+
                 uintptr_t l1 = PA2KA(frame_alloc(frames, FRAME_LOWMEM, 0));
                 memsetb((void *) l1, FRAMES2SIZE(frames), 0);