Changes in kernel/generic/src/mm/km.c [5c7be3e:300f4c4] in mainline

File:

• kernel/generic/src/mm/km.c (modified) (8 diffs)

kernel/generic/src/mm/km.c

@@ -38 +38 @@
 #include <mm/km.h>
 #include <arch/mm/km.h>
+#include <assert.h>
 #include <mm/page.h>
 #include <mm/frame.h>
@@ -44 +45 @@
 #include <typedefs.h>
 #include <lib/ra.h>
-#include <debug.h>
 #include <arch.h>
 #include <align.h>
@@ -95 +95 @@
 {
         km_ni_arena = ra_arena_create();
-        ASSERT(km_ni_arena != NULL);
+        assert(km_ni_arena != NULL);
         km_non_identity_arch_init();
         config.non_identity_configured = true;
@@ -112 +112 @@
 
         span_added = ra_span_add(km_ni_arena, base, size);
-        ASSERT(span_added);
+        assert(span_added);
 }
 
 uintptr_t km_page_alloc(size_t size, size_t align)
 {
-        return ra_alloc(km_ni_arena, size, align);
+        uintptr_t base;
+        if (ra_alloc(km_ni_arena, size, align, &base))
+                return base;
+        else
+                return (uintptr_t) NULL;
 }
 
@@ -132 +136 @@
         uintptr_t offs;
 
-        ASSERT(ALIGN_DOWN(paddr, FRAME_SIZE) == paddr);
-        ASSERT(ALIGN_UP(size, FRAME_SIZE) == size);
+        assert(ALIGN_DOWN(paddr, FRAME_SIZE) == paddr);
+        assert(ALIGN_UP(size, FRAME_SIZE) == size);
 
         /* Enforce natural or at least PAGE_SIZE alignment. */
@@ -154 +158 @@
         ipl_t ipl;
 
-        ASSERT(ALIGN_DOWN(vaddr, PAGE_SIZE) == vaddr);
-        ASSERT(ALIGN_UP(size, PAGE_SIZE) == size);
+        assert(ALIGN_DOWN(vaddr, PAGE_SIZE) == vaddr);
+        assert(ALIGN_UP(size, PAGE_SIZE) == size);
 
         page_table_lock(AS_KERNEL, true);
@@ -240 +244 @@
 uintptr_t km_temporary_page_get(uintptr_t *framep, frame_flags_t flags)
 {
-        ASSERT(THREAD);
-        ASSERT(framep);
-        ASSERT(!(flags & ~(FRAME_NO_RESERVE | FRAME_ATOMIC)));
+        assert(THREAD);
+        assert(framep);
+        assert(!(flags & ~(FRAME_NO_RESERVE | FRAME_ATOMIC)));
         
         /*
@@ -281 +285 @@
 void km_temporary_page_put(uintptr_t page)
 {
-        ASSERT(THREAD);
+        assert(THREAD);
 
         if (km_is_non_identity(page))