Changes in kernel/genarch/src/mm/page_pt.c [db8626d:63e27ef] in mainline

File:

• kernel/genarch/src/mm/page_pt.c (modified) (8 diffs)

kernel/genarch/src/mm/page_pt.c

@@ -36 +36 @@
  */
 
+#include <assert.h>
 #include <genarch/mm/page_pt.h>
 #include <mm/page.h>
@@ -46 +47 @@
 #include <typedefs.h>
 #include <arch/asm.h>
-#include <memstr.h>
+#include <mem.h>
 #include <align.h>
 #include <macros.h>
@@ -81 +82 @@
         pte_t *ptl0 = (pte_t *) PA2KA((uintptr_t) as->genarch.page_table);
 
-        ASSERT(page_table_locked(as));
+        assert(page_table_locked(as));
         
         if (GET_PTL1_FLAGS(ptl0, PTL0_INDEX(page)) & PAGE_NOT_PRESENT) {
@@ -159 +160 @@
 void pt_mapping_remove(as_t *as, uintptr_t page)
 {
-        ASSERT(page_table_locked(as));
+        assert(page_table_locked(as));
 
         /*
@@ -293 +294 @@
 static pte_t *pt_mapping_find_internal(as_t *as, uintptr_t page, bool nolock)
 {
-        ASSERT(nolock || page_table_locked(as));
+        assert(nolock || page_table_locked(as));
 
         pte_t *ptl0 = (pte_t *) PA2KA((uintptr_t) as->genarch.page_table);
@@ -358 +359 @@
                 panic("Updating non-existent PTE");     
 
-        ASSERT(PTE_VALID(t) == PTE_VALID(pte));
-        ASSERT(PTE_PRESENT(t) == PTE_PRESENT(pte));
-        ASSERT(PTE_GET_FRAME(t) == PTE_GET_FRAME(pte));
-        ASSERT(PTE_WRITABLE(t) == PTE_WRITABLE(pte));
-        ASSERT(PTE_EXECUTABLE(t) == PTE_EXECUTABLE(pte));
+        assert(PTE_VALID(t) == PTE_VALID(pte));
+        assert(PTE_PRESENT(t) == PTE_PRESENT(pte));
+        assert(PTE_GET_FRAME(t) == PTE_GET_FRAME(pte));
+        assert(PTE_WRITABLE(t) == PTE_WRITABLE(pte));
+        assert(PTE_EXECUTABLE(t) == PTE_EXECUTABLE(pte));
 
         *t = *pte;
@@ -398 +399 @@
 void pt_mapping_make_global(uintptr_t base, size_t size)
 {
-        ASSERT(size > 0);
+        assert(size > 0);
         
         uintptr_t ptl0 = PA2KA((uintptr_t) AS_KERNEL->genarch.page_table);
@@ -416 +417 @@
             addr += ptl0_step) {
                 if (GET_PTL1_ADDRESS(ptl0, PTL0_INDEX(addr)) != 0) {
-                        ASSERT(overlaps(addr, ptl0_step,
+                        assert(overlaps(addr, ptl0_step,
                             config.identity_base, config.identity_size));