Changeset 3e828ea in mainline for kernel/arch/sparc64/src/mm/sun4u/tlb.c

Timestamp:

2019-09-23T12:49:29Z (7 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/arch/sparc64/src/mm/sun4u/tlb.c (modified) (1 diff)

kernel/arch/sparc64/src/mm/sun4u/tlb.c

@@ -311 +311 @@
                 t.a = true;
                 t.d = true;
-                dtlb_demap(TLB_DEMAP_PAGE, TLB_DEMAP_SECONDARY,
+                dtlb_demap(TLB_DEMAP_PAGE,
+                    (as == AS_KERNEL) ? TLB_DEMAP_PRIMARY : TLB_DEMAP_SECONDARY,
                     page_16k + index * MMU_PAGE_SIZE);
                 dtlb_pte_copy(&t, index, false);