Changeset 95c675b in mainline for kernel/test/smpcall/smpcall1.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/test/smpcall/smpcall1.c (modified) (2 diffs)

kernel/test/smpcall/smpcall1.c

@@ -30 +30 @@
 #include <debug.h>
 
+#include <assert.h>
 #include <test.h>
 #include <smp/smp_call.h>
@@ -50 +51 @@
 static void inc(void *p)
 {
-        ASSERT(interrupts_disabled());
+        assert(interrupts_disabled());
 
         size_t *pcall_cnt = (size_t*)p;