Changeset 0c2d9bb in mainline for kernel/genarch/src/mm/as_pt.c

Timestamp:

2013-12-25T22:54:29Z (10 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

b51cf2c

Parents:

f7a33de (diff), ac36aed (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merge mainline changes

File:

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

kernel/genarch/src/mm/as_pt.c

@@ -73 +73 @@
 pte_t *ptl0_create(unsigned int flags)
 {
-        pte_t *dst_ptl0 = (pte_t *) frame_alloc(PTL0_SIZE,
-            FRAME_LOWMEM | FRAME_KA);
-        size_t table_size = FRAME_SIZE << PTL0_SIZE;
+        pte_t *dst_ptl0 = (pte_t *)
+            PA2KA(frame_alloc(PTL0_FRAMES, FRAME_LOWMEM, PTL0_SIZE - 1));
         
         if (flags & FLAG_AS_KERNEL)
-                memsetb(dst_ptl0, table_size, 0);
+                memsetb(dst_ptl0, PTL0_SIZE, 0);
         else {
                 /*
                  * Copy the kernel address space portion to new PTL0.
-                 *
                  */
                 
@@ -95 +93 @@
                     &dst_ptl0[PTL0_INDEX(KERNEL_ADDRESS_SPACE_START)];
                 
-                memsetb(dst_ptl0, table_size, 0);
+                memsetb(dst_ptl0, PTL0_SIZE, 0);
                 memcpy((void *) dst, (void *) src,
-                    table_size - (src - (uintptr_t) src_ptl0));
+                    PTL0_SIZE - (src - (uintptr_t) src_ptl0));
                 
                 mutex_unlock(&AS_KERNEL->lock);
@@ -114 +112 @@
 void ptl0_destroy(pte_t *page_table)
 {
-        frame_free((uintptr_t) page_table);
+        frame_free((uintptr_t) page_table, PTL0_FRAMES);
 }