Changeset 1c7a170 in mainline for kernel/generic/src/mm

Timestamp:

2018-03-27T16:49:29Z (8 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

Location:

kernel/generic/src/mm

Files:

• as.c (modified) (1 diff)
• km.c (modified) (1 diff)

kernel/generic/src/mm/as.c

@@ -1217 +1217 @@
 NO_TRACE static unsigned int area_flags_to_page_flags(unsigned int aflags)
 {
-        unsigned int flags = PAGE_USER | PAGE_PRESENT;
+        unsigned int flags = PAGE_USER;
 
         if (aflags & AS_AREA_READ)
-                flags |= PAGE_READ;
+                flags |= _PAGE_READ;
 
         if (aflags & AS_AREA_WRITE)
-                flags |= PAGE_WRITE;
+                flags |= _PAGE_WRITE;
 
         if (aflags & AS_AREA_EXEC)
-                flags |= PAGE_EXEC;
+                flags |= _PAGE_EXEC;
 
         if (aflags & AS_AREA_CACHEABLE)
                 flags |= PAGE_CACHEABLE;
+        else
+                flags |= PAGE_NOT_CACHEABLE;
 
         return flags;

kernel/generic/src/mm/km.c

@@ -257 +257 @@
         if (frame) {
                 page = km_map(frame, PAGE_SIZE,
-                    PAGE_READ | PAGE_WRITE | PAGE_CACHEABLE);
+                    PAGE_READ_WRITE | PAGE_KERNEL | PAGE_CACHEABLE);
                 if (!page) {
                         frame_free(frame, 1);