Changeset 63e27ef in mainline for kernel/generic/src/mm/page.c

Timestamp:

2017-06-19T21:47:42Z (8 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

deacc58d

Parents:

7354b5e

Message:

ASSERT → assert

File:

• kernel/generic/src/mm/page.c (modified) (6 diffs)

kernel/generic/src/mm/page.c

@@ -69 +69 @@
 #include <typedefs.h>
 #include <arch/asm.h>
-#include <debug.h>
 #include <arch.h>
+#include <assert.h>
 #include <syscall/copy.h>
 #include <errno.h>
@@ -98 +98 @@
     unsigned int flags)
 {
-        ASSERT(page_table_locked(as));
-        
-        ASSERT(page_mapping_operations);
-        ASSERT(page_mapping_operations->mapping_insert);
+        assert(page_table_locked(as));
+        
+        assert(page_mapping_operations);
+        assert(page_mapping_operations->mapping_insert);
 
         page_mapping_operations->mapping_insert(as, ALIGN_DOWN(page, PAGE_SIZE),
@@ -122 +122 @@
 NO_TRACE void page_mapping_remove(as_t *as, uintptr_t page)
 {
-        ASSERT(page_table_locked(as));
-        
-        ASSERT(page_mapping_operations);
-        ASSERT(page_mapping_operations->mapping_remove);
+        assert(page_table_locked(as));
+        
+        assert(page_mapping_operations);
+        assert(page_mapping_operations->mapping_remove);
         
         page_mapping_operations->mapping_remove(as,
@@ -147 +147 @@
     pte_t *pte)
 {
-        ASSERT(nolock || page_table_locked(as));
-        
-        ASSERT(page_mapping_operations);
-        ASSERT(page_mapping_operations->mapping_find);
+        assert(nolock || page_table_locked(as));
+        
+        assert(page_mapping_operations);
+        assert(page_mapping_operations->mapping_find);
         
         return page_mapping_operations->mapping_find(as,
@@ -168 +168 @@
     pte_t *pte)
 {
-        ASSERT(nolock || page_table_locked(as));
-        
-        ASSERT(page_mapping_operations);
-        ASSERT(page_mapping_operations->mapping_find);
+        assert(nolock || page_table_locked(as));
+        
+        assert(page_mapping_operations);
+        assert(page_mapping_operations->mapping_find);
         
         page_mapping_operations->mapping_update(as,
@@ -184 +184 @@
 void page_mapping_make_global(uintptr_t base, size_t size)
 {
-        ASSERT(page_mapping_operations);
-        ASSERT(page_mapping_operations->mapping_make_global);
+        assert(page_mapping_operations);
+        assert(page_mapping_operations->mapping_make_global);
         
         return page_mapping_operations->mapping_make_global(base, size);