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

kernel/generic/src/mm/backend_phys.c

@@ -37 +37 @@
  */
 
-#include <debug.h>
+#include <assert.h>
 #include <typedefs.h>
 #include <mm/as.h>
@@ -43 +43 @@
 #include <mm/frame.h>
 #include <mm/slab.h>
-#include <memstr.h>
 #include <macros.h>
 #include <arch.h>
@@ -96 +95 @@
 void phys_share(as_area_t *area)
 {
-        ASSERT(mutex_locked(&area->as->lock));
-        ASSERT(mutex_locked(&area->lock));
+        assert(mutex_locked(&area->as->lock));
+        assert(mutex_locked(&area->lock));
 }
 
@@ -136 +135 @@
         uintptr_t base = area->backend_data.base;
 
-        ASSERT(page_table_locked(AS));
-        ASSERT(mutex_locked(&area->lock));
-        ASSERT(IS_ALIGNED(upage, PAGE_SIZE));
+        assert(page_table_locked(AS));
+        assert(mutex_locked(&area->lock));
+        assert(IS_ALIGNED(upage, PAGE_SIZE));
 
         if (!as_area_check_access(area, access))
                 return AS_PF_FAULT;
 
-        ASSERT(upage - area->base < area->backend_data.frames * FRAME_SIZE);
+        assert(upage - area->base < area->backend_data.frames * FRAME_SIZE);
         page_mapping_insert(AS, upage, base + (upage - area->base),
             as_area_get_flags(area));