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

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

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

@@ -82 +82 @@
 
 /* Flags mask for non-leaf page table entries */
-#define NON_LEAF_MASK  (~(PAGE_READ | PAGE_WRITE | PAGE_EXEC))
+#define NON_LEAF_MASK  (~(PAGE_WRITE | PAGE_EXEC))
 
 /* Get PTE address accessors for each level. */
@@ -183 +183 @@
         pte_t *entry = &pt[i];
 
-        return (((!entry->valid) << PAGE_PRESENT_SHIFT) |
+        return (((!entry->valid) << PAGE_NOT_PRESENT_SHIFT) |
             (entry->user << PAGE_USER_SHIFT) |
-            (entry->readable << PAGE_READ_SHIFT) |
             (entry->writable << PAGE_WRITE_SHIFT) |
             (entry->executable << PAGE_EXEC_SHIFT) |
@@ -196 +195 @@
 
         entry->valid = !(flags & PAGE_NOT_PRESENT);
-        entry->readable = (flags & PAGE_READ) != 0;
+        entry->readable = 1;
         entry->writable = (flags & PAGE_WRITE) != 0;
         entry->executable = (flags & PAGE_EXEC) != 0;