Changeset 6b781c0 in mainline for kernel/genarch/src/mm/page_pt.c

Timestamp:

2007-06-08T15:02:49Z (17 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

c03ee1c

Parents:

3ee8a075

Message:

Merge arm32 into trunk.

File:

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

kernel/genarch/src/mm/page_pt.c

@@ -76 +76 @@
 
         if (GET_PTL1_FLAGS(ptl0, PTL0_INDEX(page)) & PAGE_NOT_PRESENT) {
-                newpt = (pte_t *)frame_alloc(ONE_FRAME, FRAME_KA);
-                memsetb((uintptr_t)newpt, PAGE_SIZE, 0);
+                newpt = (pte_t *)frame_alloc(PTL1_SIZE, FRAME_KA);
+                memsetb((uintptr_t)newpt, FRAME_SIZE << PTL1_SIZE, 0);
                 SET_PTL1_ADDRESS(ptl0, PTL0_INDEX(page), KA2PA(newpt));
                 SET_PTL1_FLAGS(ptl0, PTL0_INDEX(page), PAGE_PRESENT | PAGE_USER | PAGE_EXEC | PAGE_CACHEABLE | PAGE_WRITE);
@@ -85 +85 @@
 
         if (GET_PTL2_FLAGS(ptl1, PTL1_INDEX(page)) & PAGE_NOT_PRESENT) {
-                newpt = (pte_t *)frame_alloc(ONE_FRAME, FRAME_KA);
-                memsetb((uintptr_t)newpt, PAGE_SIZE, 0);
+                newpt = (pte_t *)frame_alloc(PTL2_SIZE, FRAME_KA);
+                memsetb((uintptr_t)newpt, FRAME_SIZE << PTL2_SIZE, 0);
                 SET_PTL2_ADDRESS(ptl1, PTL1_INDEX(page), KA2PA(newpt));
                 SET_PTL2_FLAGS(ptl1, PTL1_INDEX(page), PAGE_PRESENT | PAGE_USER | PAGE_EXEC | PAGE_CACHEABLE | PAGE_WRITE);
@@ -94 +94 @@
 
         if (GET_PTL3_FLAGS(ptl2, PTL2_INDEX(page)) & PAGE_NOT_PRESENT) {
-                newpt = (pte_t *)frame_alloc(ONE_FRAME, FRAME_KA);
-                memsetb((uintptr_t)newpt, PAGE_SIZE, 0);
+                newpt = (pte_t *)frame_alloc(PTL3_SIZE, FRAME_KA);
+                memsetb((uintptr_t)newpt, FRAME_SIZE << PTL3_SIZE, 0);
                 SET_PTL3_ADDRESS(ptl2, PTL2_INDEX(page), KA2PA(newpt));
                 SET_PTL3_FLAGS(ptl2, PTL2_INDEX(page), PAGE_PRESENT | PAGE_USER | PAGE_EXEC | PAGE_CACHEABLE | PAGE_WRITE);