Changeset 6be2c13 in mainline for kernel/arch/mips32/include/arch/mm/page.h

Timestamp:

2018-03-16T20:58:20Z (6 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/arch/mips32/include/arch/mm/page.h (modified) (2 diffs)

kernel/arch/mips32/include/arch/mm/page.h

@@ -114 +114 @@
         get_pt_flags((pte_t *) (ptl0), (size_t) (i))
 #define GET_PTL2_FLAGS_ARCH(ptl1, i) \
-        PAGE_PRESENT
+        0
 #define GET_PTL3_FLAGS_ARCH(ptl2, i) \
-        PAGE_PRESENT
+        0
 #define GET_FRAME_FLAGS_ARCH(ptl3, i) \
         get_pt_flags((pte_t *) (ptl3), (size_t) (i))
@@ -167 +167 @@
 
         return ((p->cacheable << PAGE_CACHEABLE_SHIFT) |
-            ((!p->p) << PAGE_PRESENT_SHIFT) |
+            ((!p->p) << PAGE_NOT_PRESENT_SHIFT) |
             (1 << PAGE_USER_SHIFT) |
-            (1 << PAGE_READ_SHIFT) |
             ((p->w) << PAGE_WRITE_SHIFT) |
             (1 << PAGE_EXEC_SHIFT) |