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

Timestamp:

2013-09-17T19:51:20Z (12 years ago)

Author:

Jakub Klama <jakub.klama@…>

Branches:

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

Children:

6ac3d27

Parents:

3efc35a (diff), ca62f86 (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 from launchpad branch.

File:

• kernel/genarch/src/mm/page_pt.c (modified) (2 diffs)

kernel/genarch/src/mm/page_pt.c

@@ -128 +128 @@
                  */
                 write_barrier();
-                SET_PTL2_PRESENT(ptl1, PTL1_INDEX(page));       
+                SET_PTL2_PRESENT(ptl1, PTL1_INDEX(page));
         }
         
@@ -205 +205 @@
          * Destroy the mapping.
          * Setting to PAGE_NOT_PRESENT is not sufficient.
-         */
+         * But we need SET_FRAME for possible PT coherence maintenance.
+         * At least on ARM.
+         */
+        //TODO: Fix this inconsistency
+        SET_FRAME_FLAGS(ptl3, PTL3_INDEX(page), PAGE_NOT_PRESENT);
         memsetb(&ptl3[PTL3_INDEX(page)], sizeof(pte_t), 0);