Changeset 1c7a170 in mainline for kernel/genarch/src/mm/page_ht.c

Timestamp:

2018-03-27T16:49:29Z (7 years ago)

Author:

GitHub <noreply@…>

Parents:

f303afc6 (diff), 94d211e (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-27 16:49:29)

git-committer:

GitHub <noreply@…> (2018-03-27 16:49:29)

Message:

Merge 94d211e1f212626c420cf42c22b056ac1db9c0f1 into f303afc69bfdfc798071487501f775a7c4d8c475

File:

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

kernel/genarch/src/mm/page_ht.c

@@ -61 +61 @@
 static void ht_mapping_remove(as_t *, uintptr_t);
 static bool ht_mapping_find(as_t *, uintptr_t, bool, pte_t *);
-static void ht_mapping_update(as_t *, uintptr_t, bool, pte_t *);
+static void ht_mapping_update(as_t *, uintptr_t, bool, const pte_t *);
 static void ht_mapping_make_global(uintptr_t, size_t);
 
@@ -168 +168 @@
 
                 pte->g = (flags & PAGE_GLOBAL) != 0;
-                pte->x = (flags & PAGE_EXEC) != 0;
-                pte->w = (flags & PAGE_WRITE) != 0;
+                pte->x = (flags & _PAGE_EXEC) != 0;
+                pte->w = (flags & _PAGE_WRITE) != 0;
                 pte->k = !(flags & PAGE_USER);
                 pte->c = (flags & PAGE_CACHEABLE) != 0;
@@ -268 +268 @@
  * @param pte      New PTE.
  */
-void ht_mapping_update(as_t *as, uintptr_t page, bool nolock, pte_t *pte)
+void ht_mapping_update(as_t *as, uintptr_t page, bool nolock, const pte_t *pte)
 {
         irq_spinlock_lock(&page_ht_lock, true);