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

Timestamp:

2019-06-27T08:51:20Z (7 years ago)

Author:

Jaroslav Jindrak <dzejrou@…>

Branches:

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

Children:

8add15e0

Parents:

ad40b74b (diff), aeba767 (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:

cpp: merge and resolve conflicts

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);