Changes in kernel/genarch/src/mm/page_pt.c [e943ecf:caed0279] in mainline

File:

• kernel/genarch/src/mm/page_pt.c (modified) (7 diffs)

kernel/genarch/src/mm/page_pt.c

@@ -43 +43 @@
 #include <arch/mm/page.h>
 #include <arch/mm/as.h>
-#include <arch/barrier.h>
 #include <typedefs.h>
 #include <arch/asm.h>
@@ -87 +86 @@
                 SET_PTL1_ADDRESS(ptl0, PTL0_INDEX(page), KA2PA(newpt));
                 SET_PTL1_FLAGS(ptl0, PTL0_INDEX(page),
-                    PAGE_NOT_PRESENT | PAGE_USER | PAGE_EXEC | PAGE_CACHEABLE |
+                    PAGE_PRESENT | PAGE_USER | PAGE_EXEC | PAGE_CACHEABLE |
                     PAGE_WRITE);
-                write_barrier();
-                SET_PTL1_PRESENT(ptl0, PTL0_INDEX(page));
         }
         
@@ -101 +98 @@
                 SET_PTL2_ADDRESS(ptl1, PTL1_INDEX(page), KA2PA(newpt));
                 SET_PTL2_FLAGS(ptl1, PTL1_INDEX(page),
-                    PAGE_NOT_PRESENT | PAGE_USER | PAGE_EXEC | PAGE_CACHEABLE |
+                    PAGE_PRESENT | PAGE_USER | PAGE_EXEC | PAGE_CACHEABLE |
                     PAGE_WRITE);
-                write_barrier();
-                SET_PTL2_PRESENT(ptl1, PTL1_INDEX(page));       
         }
         
@@ -115 +110 @@
                 SET_PTL3_ADDRESS(ptl2, PTL2_INDEX(page), KA2PA(newpt));
                 SET_PTL3_FLAGS(ptl2, PTL2_INDEX(page),
-                    PAGE_NOT_PRESENT | PAGE_USER | PAGE_EXEC | PAGE_CACHEABLE |
+                    PAGE_PRESENT | PAGE_USER | PAGE_EXEC | PAGE_CACHEABLE |
                     PAGE_WRITE);
-                write_barrier();
-                SET_PTL3_PRESENT(ptl2, PTL2_INDEX(page));
         }
         
@@ -124 +117 @@
         
         SET_FRAME_ADDRESS(ptl3, PTL3_INDEX(page), frame);
-        SET_FRAME_FLAGS(ptl3, PTL3_INDEX(page), flags | PAGE_NOT_PRESENT);
-        write_barrier();
-        SET_FRAME_PRESENT(ptl3, PTL3_INDEX(page));
+        SET_FRAME_FLAGS(ptl3, PTL3_INDEX(page), flags);
 }
 
@@ -288 +279 @@
         if (GET_PTL1_FLAGS(ptl0, PTL0_INDEX(page)) & PAGE_NOT_PRESENT)
                 return NULL;
-
-        read_barrier();
         
         pte_t *ptl1 = (pte_t *) PA2KA(GET_PTL1_ADDRESS(ptl0, PTL0_INDEX(page)));
         if (GET_PTL2_FLAGS(ptl1, PTL1_INDEX(page)) & PAGE_NOT_PRESENT)
                 return NULL;
-
-#if (PTL1_ENTRIES != 0)
-        read_barrier();
-#endif
         
         pte_t *ptl2 = (pte_t *) PA2KA(GET_PTL2_ADDRESS(ptl1, PTL1_INDEX(page)));
         if (GET_PTL3_FLAGS(ptl2, PTL2_INDEX(page)) & PAGE_NOT_PRESENT)
                 return NULL;
-
-#if (PTL2_ENTRIES != 0)
-        read_barrier();
-#endif
         
         pte_t *ptl3 = (pte_t *) PA2KA(GET_PTL3_ADDRESS(ptl2, PTL2_INDEX(page)));
@@ -365 +346 @@
                 SET_PTL1_ADDRESS(ptl0, PTL0_INDEX(addr), KA2PA(l1));
                 SET_PTL1_FLAGS(ptl0, PTL0_INDEX(addr),
-                    PAGE_PRESENT | PAGE_USER | PAGE_CACHEABLE |
-                    PAGE_EXEC | PAGE_WRITE | PAGE_READ);
+                    PAGE_PRESENT | PAGE_USER | PAGE_EXEC | PAGE_CACHEABLE |
+                    PAGE_WRITE);
         }
 }