Changeset 96cd5b4 in mainline for kernel/genarch/src/mm/as_pt.c

Timestamp:

2012-01-04T13:37:10Z (13 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

9957a97

Parents:

ecf823a (diff), c520034 (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 with mainline

File:

• kernel/genarch/src/mm/as_pt.c (modified) (2 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_KA);
+        pte_t *dst_ptl0 = (pte_t *) frame_alloc(PTL0_SIZE,
+            FRAME_LOWMEM | FRAME_KA);
         size_t table_size = FRAME_SIZE << PTL0_SIZE;
         
@@ -89 +90 @@
                     (pte_t *) PA2KA((uintptr_t) AS_KERNEL->genarch.page_table);
                 
-                uintptr_t src =
-                    (uintptr_t) &src_ptl0[PTL0_INDEX(KERNEL_ADDRESS_SPACE_START)];
-                uintptr_t dst =
-                    (uintptr_t) &dst_ptl0[PTL0_INDEX(KERNEL_ADDRESS_SPACE_START)];
+                uintptr_t src = (uintptr_t)
+                    &src_ptl0[PTL0_INDEX(KERNEL_ADDRESS_SPACE_START)];
+                uintptr_t dst = (uintptr_t)
+                    &dst_ptl0[PTL0_INDEX(KERNEL_ADDRESS_SPACE_START)];
                 
                 memsetb(dst_ptl0, table_size, 0);