Changes in kernel/genarch/src/mm/page_pt.c [e2a0d76:15187c3] in mainline

File:

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

kernel/genarch/src/mm/page_pt.c

@@ -82 +82 @@
         
         if (GET_PTL1_FLAGS(ptl0, PTL0_INDEX(page)) & PAGE_NOT_PRESENT) {
-                pte_t *newpt = (pte_t *) PA2KA(frame_alloc(PTL1_SIZE,
-                    FRAME_LOWMEM, 0));
+                pte_t *newpt = (pte_t *) frame_alloc(PTL1_SIZE,
+                    FRAME_LOWMEM | FRAME_KA);
                 memsetb(newpt, FRAME_SIZE << PTL1_SIZE, 0);
                 SET_PTL1_ADDRESS(ptl0, PTL0_INDEX(page), KA2PA(newpt));
@@ -101 +101 @@
         
         if (GET_PTL2_FLAGS(ptl1, PTL1_INDEX(page)) & PAGE_NOT_PRESENT) {
-                pte_t *newpt = (pte_t *) PA2KA(frame_alloc(PTL2_SIZE,
-                    FRAME_LOWMEM, 0));
+                pte_t *newpt = (pte_t *) frame_alloc(PTL2_SIZE,
+                    FRAME_LOWMEM | FRAME_KA);
                 memsetb(newpt, FRAME_SIZE << PTL2_SIZE, 0);
                 SET_PTL2_ADDRESS(ptl1, PTL1_INDEX(page), KA2PA(newpt));
@@ -118 +118 @@
         
         if (GET_PTL3_FLAGS(ptl2, PTL2_INDEX(page)) & PAGE_NOT_PRESENT) {
-                pte_t *newpt = (pte_t *) PA2KA(frame_alloc(PTL3_SIZE,
-                    FRAME_LOWMEM, 0));
+                pte_t *newpt = (pte_t *) frame_alloc(PTL3_SIZE,
+                    FRAME_LOWMEM | FRAME_KA);
                 memsetb(newpt, FRAME_SIZE << PTL3_SIZE, 0);
                 SET_PTL3_ADDRESS(ptl2, PTL2_INDEX(page), KA2PA(newpt));
@@ -363 +363 @@
  * @param size Size in bytes defining the range of PTL0 entries that will be
  *             altered by this function.
- *
  */
 void pt_mapping_make_global(uintptr_t base, size_t size)
 {
-        ASSERT(size > 0);
-        
         uintptr_t ptl0 = PA2KA((uintptr_t) AS_KERNEL->genarch.page_table);
         uintptr_t ptl0_step = ptl0_step_get();
         size_t order;
-        
+        uintptr_t addr;
+
 #if (PTL1_ENTRIES != 0)
         order = PTL1_SIZE;
@@ -380 +378 @@
         order = PTL3_SIZE;
 #endif
-        
-        for (uintptr_t addr = ALIGN_DOWN(base, ptl0_step);
-            addr - 1 < base + size - 1;
+
+        ASSERT(size > 0);
+
+        for (addr = ALIGN_DOWN(base, ptl0_step); addr - 1 < base + size - 1;
             addr += ptl0_step) {
-                uintptr_t l1 = PA2KA(frame_alloc(order, FRAME_LOWMEM, 0));
+                uintptr_t l1;
+
+                l1 = (uintptr_t) frame_alloc(order, FRAME_KA | FRAME_LOWMEM);
                 memsetb((void *) l1, FRAME_SIZE << order, 0);
                 SET_PTL1_ADDRESS(ptl0, PTL0_INDEX(addr), KA2PA(l1));