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

Timestamp:

2018-03-16T20:58:20Z (7 years ago)

Author:

GitHub <noreply@…>

Parents:

973be387 (diff), 4b1c7c6f (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.

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-03-16 20:58:20)

git-committer:

GitHub <noreply@…> (2018-03-16 20:58:20)

Message:

Merge 4b1c7c6ff1e7b982f389a8f841b71af2a85e8cfb into 973be38782462a672111ff6833f8dbb40d2a44bf

File:

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

kernel/genarch/src/mm/page_pt.c

@@ -55 +55 @@
 static void pt_mapping_remove(as_t *, uintptr_t);
 static bool pt_mapping_find(as_t *, uintptr_t, bool, pte_t *pte);
-static void pt_mapping_update(as_t *, uintptr_t, bool, pte_t *pte);
+static void pt_mapping_update(as_t *, uintptr_t, bool, const pte_t *pte);
 static void pt_mapping_make_global(uintptr_t, size_t);
 
@@ -353 +353 @@
  * @param[in] pte  New PTE.
  */
-void pt_mapping_update(as_t *as, uintptr_t page, bool nolock, pte_t *pte)
+void pt_mapping_update(as_t *as, uintptr_t page, bool nolock, const pte_t *pte)
 {
         pte_t *t = pt_mapping_find_internal(as, page, nolock);
@@ -431 +431 @@
                 SET_PTL1_ADDRESS(ptl0, PTL0_INDEX(addr), KA2PA(l1));
                 SET_PTL1_FLAGS(ptl0, PTL0_INDEX(addr),
-                    PAGE_PRESENT | PAGE_USER | PAGE_CACHEABLE |
-                    PAGE_EXEC | PAGE_WRITE | PAGE_READ);
+                    PAGE_USER | PAGE_CACHEABLE |
+                    PAGE_EXEC | PAGE_WRITE);
         }
 }