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

File:

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

kernel/generic/src/mm/km.c

@@ -49 +49 @@
 #include <macros.h>
 #include <bitops.h>
+#include <proc/thread.h>
 
 static ra_arena_t *km_ni_arena;
@@ -247 +248 @@
          */
         uintptr_t page;
-        uintptr_t frame =
-            frame_alloc(1, FRAME_HIGHMEM | FRAME_ATOMIC | flags, 0);
+        uintptr_t frame;
+
+        frame = frame_alloc(1, FRAME_HIGHMEM | FRAME_ATOMIC | flags, 0);
         if (frame) {
                 page = km_map(frame, PAGE_SIZE,
                     PAGE_READ | PAGE_WRITE | PAGE_CACHEABLE);
-                
-                // FIXME
-                ASSERT(page);
+                if (!page) {    
+                        frame_free(frame, 1);
+                        goto lowmem;
+                }
         } else {
+lowmem:
                 frame = frame_alloc(1, FRAME_LOWMEM | flags, 0);
                 if (!frame)