Changes in kernel/arch/arm32/include/mm/page.h [0d8269b:9d58539] in mainline

File:

• kernel/arch/arm32/include/mm/page.h (modified) (5 diffs)

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

@@ -40 +40 @@
 #include <mm/mm.h>
 #include <arch/exception.h>
-#include <arch/barrier.h>
 #include <trace.h>
 
@@ -110 +109 @@
 #define SET_FRAME_FLAGS_ARCH(ptl3, i, x) \
         set_pt_level1_flags((pte_t *) (ptl3), (size_t) (i), (x))
-
-/* Set PTE present bit accessors for each level. */
-#define SET_PTL1_PRESENT_ARCH(ptl0, i) \
-        set_pt_level0_present((pte_t *) (ptl0), (size_t) (i))
-#define SET_PTL2_PRESENT_ARCH(ptl1, i)
-#define SET_PTL3_PRESENT_ARCH(ptl2, i)
-#define SET_FRAME_PRESENT_ARCH(ptl3, i) \
-        set_pt_level1_present((pte_t *) (ptl3), (size_t) (i))
 
 /* Macros for querying the last-level PTE entries. */
@@ -276 +267 @@
 }
 
-NO_TRACE static inline void set_pt_level0_present(pte_t *pt, size_t i)
-{
-        pte_level0_t *p = &pt[i].l0;
-
-        p->should_be_zero = 0;
-        write_barrier();
-        p->descriptor_type = PTE_DESCRIPTOR_COARSE_TABLE;
-}
 
 /** Sets flags of level 1 page table entry.
@@ -300 +283 @@
         pte_level1_t *p = &pt[i].l1;
         
-        if (flags & PAGE_NOT_PRESENT)
+        if (flags & PAGE_NOT_PRESENT) {
                 p->descriptor_type = PTE_DESCRIPTOR_NOT_PRESENT;
-        else
+                p->access_permission_3 = 1;
+        } else {
                 p->descriptor_type = PTE_DESCRIPTOR_SMALL_PAGE;
+                p->access_permission_3 = p->access_permission_0;
+        }
         
         p->cacheable = p->bufferable = (flags & PAGE_CACHEABLE) != 0;
@@ -326 +312 @@
 }
 
-NO_TRACE static inline void set_pt_level1_present(pte_t *pt, size_t i)
-{
-        pte_level1_t *p = &pt[i].l1;
-
-        p->descriptor_type = PTE_DESCRIPTOR_SMALL_PAGE;
-}
-        
+
 extern void page_arch_init(void);
 
+
 #endif /* __ASM__ */