Changes in kernel/generic/src/mm/km.c [5c7be3e:c387838] 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;
@@ -240 +239 @@
 uintptr_t km_temporary_page_get(uintptr_t *framep, frame_flags_t flags)
 {
+        uintptr_t frame;
+        uintptr_t page;
+
         ASSERT(THREAD);
         ASSERT(framep);
         ASSERT(!(flags & ~(FRAME_NO_RESERVE | FRAME_ATOMIC)));
-        
+
         /*
          * Allocate a frame, preferably from high memory.
          */
-        uintptr_t page;
-        uintptr_t frame;
-
-        frame = frame_alloc(1, FRAME_HIGHMEM | FRAME_ATOMIC | flags, 0);
+        frame = (uintptr_t) frame_alloc(ONE_FRAME,
+            FRAME_HIGHMEM | FRAME_ATOMIC | flags); 
         if (frame) {
                 page = km_map(frame, PAGE_SIZE,
                     PAGE_READ | PAGE_WRITE | PAGE_CACHEABLE);
-                if (!page) {    
-                        frame_free(frame, 1);
-                        goto lowmem;
-                }
+                ASSERT(page);   // FIXME
         } else {
-lowmem:
-                frame = frame_alloc(1, FRAME_LOWMEM | flags, 0);
+                frame = (uintptr_t) frame_alloc(ONE_FRAME,
+                    FRAME_LOWMEM | flags);
                 if (!frame)
                         return (uintptr_t) NULL;
-                
                 page = PA2KA(frame);
         }
-        
+
         *framep = frame;
-        return page;
+        return page;    
 }