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

kernel/arch/mips32/src/exception.c

@@ -38 +38 @@
 #include <panic.h>
 #include <arch/cp0.h>
-#include <typedefs.h>
 #include <arch.h>
-#include <debug.h>
+#include <assert.h>
 #include <proc/thread.h>
 #include <print.h>
@@ -121 +120 @@
 {
         if (*((uint32_t *) istate->epc) == 0x7c03e83b) {
-                ASSERT(THREAD);
+                assert(THREAD);
                 istate->epc += 4;
                 istate->v1 = istate->kt1;