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

Timestamp:

2017-10-17T13:11:35Z (8 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/sun4v/tlb.c (modified) (5 diffs)

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

@@ -43 +43 @@
 #include <arch/mm/tlb.h>
 #include <arch/interrupt.h>
+#include <assert.h>
 #include <interrupt.h>
 #include <arch.h>
@@ -215 +216 @@
         bool found = page_mapping_find(AS, va, true, &t);
         if (found && PTE_EXECUTABLE(&t)) {
-                ASSERT(t.p);
+                assert(t.p);
 
                 /*
@@ -265 +266 @@
         bool found = page_mapping_find(as, va, true, &t);
         if (found) {
-                ASSERT(t.p);
+                assert(t.p);
 
                 /*
@@ -303 +304 @@
         bool found = page_mapping_find(as, va, true, &t);
         if (found && PTE_WRITABLE(&t)) {
-                ASSERT(t.p);
+                assert(t.p);
 
                 /*
@@ -345 +346 @@
         __hypercall_fast_ret1(0, 0, 0, 0, 0, CPU_MYID, &myid);
 
-        ASSERT(mmu_fsas[myid].dft < 16);
+        assert(mmu_fsas[myid].dft < 16);
 
         printf("condition which caused the fault: %s\n",