Changeset 95c675b in mainline for kernel/arch/mips32/src/mm/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/mips32/src/mm/tlb.c (modified) (5 diffs)

kernel/arch/mips32/src/mm/tlb.c

@@ -44 +44 @@
 #include <print.h>
 #include <log.h>
-#include <debug.h>
+#include <assert.h>
 #include <align.h>
 #include <interrupt.h>
@@ -160 +160 @@
 #endif
 
-        ASSERT(!index.p);
+        assert(!index.p);
 
         badvaddr = cp0_badvaddr_read();
@@ -323 +323 @@
         int i;
 
-        ASSERT(interrupts_disabled());
+        assert(interrupts_disabled());
 
         hi_save.value = cp0_entry_hi_read();
@@ -356 +356 @@
         int i;
 
-        ASSERT(interrupts_disabled());
-        ASSERT(asid != ASID_INVALID);
+        assert(interrupts_disabled());
+        assert(asid != ASID_INVALID);
 
         hi_save.value = cp0_entry_hi_read();
@@ -398 +398 @@
         tlb_index_t index;
 
-        ASSERT(interrupts_disabled());
+        assert(interrupts_disabled());
         
         if (asid == ASID_INVALID)