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

Timestamp:

2017-10-17T13:11:35Z (7 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

60af4cdb

Parents:

dbf32b1 (diff), a416d070 (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

File:

• kernel/arch/sparc64/src/mm/sun4u/tlb.c (modified) (4 diffs)

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

@@ -41 +41 @@
 #include <arch/mm/mmu.h>
 #include <arch/interrupt.h>
+#include <assert.h>
 #include <interrupt.h>
 #include <arch.h>
@@ -201 +202 @@
         bool found = page_mapping_find(AS, istate->tpc, true, &t);
         if (found && PTE_EXECUTABLE(&t)) {
-                ASSERT(t.p);
+                assert(t.p);
 
                 /*
@@ -258 +259 @@
         bool found = page_mapping_find(as, page_16k, true, &t);
         if (found) {
-                ASSERT(t.p);
+                assert(t.p);
 
                 /*
@@ -301 +302 @@
         bool found = page_mapping_find(as, page_16k, true, &t);
         if (found && PTE_WRITABLE(&t)) {
-                ASSERT(t.p);
+                assert(t.p);
 
                 /*