Changeset 1c7a170 in mainline for kernel/arch/ia64/src/mm/page.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/arch/ia64/src/mm/page.c (modified) (1 diff)

kernel/arch/ia64/src/mm/page.c

@@ -246 +246 @@
         v->present.d = false;  /* not dirty */
         v->present.pl = (flags & PAGE_USER) ? PL_USER : PL_KERNEL;
-        v->present.ar = (flags & PAGE_WRITE) ? AR_WRITE : AR_READ;
-        v->present.ar |= (flags & PAGE_EXEC) ? AR_EXECUTE : 0;
+        v->present.ar = (flags & _PAGE_WRITE) ? AR_WRITE : AR_READ;
+        v->present.ar |= (flags & _PAGE_EXEC) ? AR_EXECUTE : 0;
         v->present.ppn = frame >> PPN_SHIFT;
         v->present.ed = false;  /* exception not deffered */