Changeset 95c675b in mainline for kernel/generic/src/cpu/cpu_mask.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/generic/src/cpu/cpu_mask.c (modified) (3 diffs)

kernel/generic/src/cpu/cpu_mask.c

@@ -35 +35 @@
  * @brief CPU mask manipulation functions.
  */
+#include <assert.h>
 #include <cpu/cpu_mask.h>
 #include <cpu.h>
@@ -52 +53 @@
 static void cpu_mask_count(cpu_mask_t *cpus, size_t cpu_cnt)
 {
-        ASSERT(NULL != cpus);
-        ASSERT(cpu_cnt <= config.cpu_count);
+        assert(NULL != cpus);
+        assert(cpu_cnt <= config.cpu_count);
         
         for (size_t active_word = 0; 
@@ -87 +88 @@
 void cpu_mask_none(cpu_mask_t *cpus)
 {
-        ASSERT(cpus);
+        assert(cpus);
         
         size_t word_cnt = cpu_mask_size() / word_size;