Changes in kernel/generic/src/mm/km.c [b0c2075:9d58539] in mainline

File:

• kernel/generic/src/mm/km.c (modified) (1 diff)

kernel/generic/src/mm/km.c

@@ -233 +233 @@
  * @param[inout] framep Pointer to a variable which will receive the physical
  *                      address of the allocated frame.
- * @param[in] flags     Frame allocation flags. FRAME_NONE, FRAME_NO_RESERVE
- *                      and FRAME_ATOMIC bits are allowed.
+ * @param[in] flags     Frame allocation flags. FRAME_NONE or FRAME_NO_RESERVE.
  * @return              Virtual address of the allocated frame.
  */
 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)));
-        
+        ASSERT(!(flags & ~FRAME_NO_RESERVE));
+
         /*
          * Allocate a frame, preferably from high memory.
          */
-        uintptr_t page;
-        uintptr_t 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);
-                
-                // FIXME
-                ASSERT(page);
+                ASSERT(page);   // FIXME
         } else {
-                frame = frame_alloc(1, FRAME_LOWMEM | flags, 0);
-                if (!frame)
-                        return (uintptr_t) NULL;
-                
+                frame = (uintptr_t) frame_alloc_noreserve(ONE_FRAME,
+                    FRAME_LOWMEM);
                 page = PA2KA(frame);
         }
-        
+
         *framep = frame;
-        return page;
+        return page;    
 }