Changeset 8cbf1c3 in mainline for kernel/genarch/src/mm/page_pt.c

Timestamp:

2013-09-09T23:13:10Z (11 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

e2a0d76

Parents:

c67dbd6

Message:

prepare the public API of the frame allocator for the new backend
remove FRAME_KA (can be easily implemented explicitly)

File:

• kernel/genarch/src/mm/page_pt.c (modified) (4 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 *) frame_alloc(PTL1_SIZE,
-                    FRAME_LOWMEM | FRAME_KA);
+                pte_t *newpt = (pte_t *) PA2KA(frame_alloc(PTL1_SIZE,
+                    FRAME_LOWMEM, 0));
                 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 *) frame_alloc(PTL2_SIZE,
-                    FRAME_LOWMEM | FRAME_KA);
+                pte_t *newpt = (pte_t *) PA2KA(frame_alloc(PTL2_SIZE,
+                    FRAME_LOWMEM, 0));
                 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 *) frame_alloc(PTL3_SIZE,
-                    FRAME_LOWMEM | FRAME_KA);
+                pte_t *newpt = (pte_t *) PA2KA(frame_alloc(PTL3_SIZE,
+                    FRAME_LOWMEM, 0));
                 memsetb(newpt, FRAME_SIZE << PTL3_SIZE, 0);
                 SET_PTL3_ADDRESS(ptl2, PTL2_INDEX(page), KA2PA(newpt));
@@ -385 +385 @@
                 uintptr_t l1;
 
-                l1 = (uintptr_t) frame_alloc(order, FRAME_KA | FRAME_LOWMEM);
+                l1 = PA2KA(frame_alloc(order, FRAME_LOWMEM, 0));
                 memsetb((void *) l1, FRAME_SIZE << order, 0);
                 SET_PTL1_ADDRESS(ptl0, PTL0_INDEX(addr), KA2PA(l1));