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

kernel/arch/sparc64/src/drivers/tick.c ¶

@@ -43 +43 @@
 #include <time/clock.h>
 #include <arch.h>
-#include <debug.h>
+#include <assert.h>
 
 /** Initialize tick and stick interrupt. */
@@ -93 +93 @@
          * Make sure we are servicing interrupt_level_14
          */
-        ASSERT(n == TT_INTERRUPT_LEVEL_14);
+        assert(n == TT_INTERRUPT_LEVEL_14);
         
         /*
          * Make sure we are servicing TICK_INT.
          */
-        ASSERT(softint.tick_int);
+        assert(softint.tick_int);
 
         /*