Changeset 1c7a170 in mainline for kernel/arch/ppc32/include/arch/mm/page.h

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/arch/ppc32/include/arch/mm/page.h (modified) (3 diffs)

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

@@ -111 +111 @@
 
 #define GET_PTL2_FLAGS_ARCH(ptl1, i) \
-        PAGE_PRESENT
+        PAGE_NEXT_LEVEL_PT
 
 #define GET_PTL3_FLAGS_ARCH(ptl2, i) \
-        PAGE_PRESENT
+        PAGE_NEXT_LEVEL_PT
 
 #define GET_FRAME_FLAGS_ARCH(ptl3, i) \
@@ -143 +143 @@
 #define PTE_PRESENT_ARCH(pte)     ((pte)->present != 0)
 #define PTE_GET_FRAME_ARCH(pte)   ((pte)->pfn << 12)
+#define PTE_READABLE_ARCH(pte)    1
 #define PTE_WRITABLE_ARCH(pte)    1
 #define PTE_EXECUTABLE_ARCH(pte)  1
@@ -167 +168 @@
 
         return (((!entry->page_cache_disable) << PAGE_CACHEABLE_SHIFT) |
-            ((!entry->present) << PAGE_PRESENT_SHIFT) |
+            ((!entry->present) << PAGE_NOT_PRESENT_SHIFT) |
             (1 << PAGE_USER_SHIFT) |
             (1 << PAGE_READ_SHIFT) |