Changeset 3e828ea in mainline for kernel/genarch/src/mm/as_pt.c

Timestamp:

2019-09-23T12:49:29Z (6 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

9be2358

Parents:

9259d20 (diff), 1a4ec93f (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.

git-author:

Jiri Svoboda <jiri@…> (2019-09-22 12:49:07)

git-committer:

Jiri Svoboda <jiri@…> (2019-09-23 12:49:29)

Message:

Merge changes from master, especially Meson build

File:

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

kernel/genarch/src/mm/as_pt.c

@@ -76 +76 @@
             PA2KA(frame_alloc(PTL0_FRAMES, FRAME_LOWMEM, PTL0_SIZE - 1));
 
-        if (flags & FLAG_AS_KERNEL)
-                memsetb(dst_ptl0, PTL0_SIZE, 0);
-        else {
+        memsetb(dst_ptl0, PTL0_SIZE, 0);
+
+        if (!KERNEL_SEPARATE_PTL0 && !(flags & FLAG_AS_KERNEL)) {
                 /*
                  * Copy the kernel address space portion to new PTL0.
@@ -93 +93 @@
                     &dst_ptl0[PTL0_INDEX(KERNEL_ADDRESS_SPACE_START)];
 
-                memsetb(dst_ptl0, PTL0_SIZE, 0);
                 memcpy((void *) dst, (void *) src,
                     PTL0_SIZE - (src - (uintptr_t) src_ptl0));