Changeset 95c675b in mainline for kernel/generic/include/preemption.h

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/generic/include/preemption.h (modified) (2 diffs)

kernel/generic/include/preemption.h

@@ -37 +37 @@
 
 #include <arch.h>
+#include <assert.h>
 #include <compiler/barrier.h>
-#include <debug.h>
 
 #define PREEMPTION_INC         (1 << 0)
@@ -54 +54 @@
 #define preemption_enable() \
         do { \
-                ASSERT(PREEMPTION_DISABLED); \
+                assert(PREEMPTION_DISABLED); \
                 compiler_barrier(); \
                 THE->preemption -= PREEMPTION_INC; \