Changeset 95c675b in mainline for kernel/genarch/src/mm/asid.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/genarch/src/mm/asid.c (modified) (5 diffs)

kernel/genarch/src/mm/asid.c ¶

@@ -57 +57 @@
  */
 
+#include <assert.h>
 #include <mm/asid.h>
 #include <mm/as.h>
@@ -64 +65 @@
 #include <synch/mutex.h>
 #include <adt/list.h>
-#include <debug.h>
 
 static size_t asids_allocated = 0;
@@ -78 +78 @@
         as_t *as;
 
-        ASSERT(interrupts_disabled());
-        ASSERT(spinlock_locked(&asidlock));
+        assert(interrupts_disabled());
+        assert(spinlock_locked(&asidlock));
 
         /*
@@ -98 +98 @@
                  */
                 tmp = list_first(&inactive_as_with_asid_list);
-                ASSERT(tmp != NULL);
+                assert(tmp != NULL);
                 list_remove(tmp);
                 
@@ -108 +108 @@
                  */
                 asid = as->asid;
-                ASSERT(asid != ASID_INVALID);
+                assert(asid != ASID_INVALID);
 
                 /*