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

kernel/generic/src/mm/backend_user.c

@@ -46 +46 @@
 #include <typedefs.h>
 #include <align.h>
-#include <debug.h>
+#include <assert.h>
 #include <errno.h>
 #include <log.h>
@@ -108 +108 @@
 int user_page_fault(as_area_t *area, uintptr_t upage, pf_access_t access)
 {
-        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))
@@ -162 +162 @@
 void user_frame_free(as_area_t *area, uintptr_t page, uintptr_t frame)
 {
-        ASSERT(page_table_locked(area->as));
-        ASSERT(mutex_locked(&area->lock));
+        assert(page_table_locked(area->as));
+        assert(mutex_locked(&area->lock));
 
         pfn_t pfn = ADDR2PFN(frame);