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

kernel/arch/ia32/src/ddi/ddi.c

@@ -35 +35 @@
 #include <ddi/ddi.h>
 #include <arch/ddi/ddi.h>
+#include <assert.h>
 #include <proc/task.h>
-#include <typedefs.h>
+#include <stddef.h>
 #include <adt/bitmap.h>
 #include <mm/slab.h>
@@ -63 +64 @@
         
         if (elements > 0) {
-                ASSERT(TASK->arch.iomap.bits);
+                assert(TASK->arch.iomap.bits);
                 
                 bitmap_t iomap;