Changes in kernel/generic/src/mm/km.c [96d9cdd:c387838] in mainline

File:

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

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 or FRAME_NO_RESERVE.
+ * @param[in] flags     Frame allocation flags. FRAME_NONE, FRAME_NO_RESERVE
+ *                      and FRAME_ATOMIC bits are allowed.
  * @return              Virtual address of the allocated frame.
  */
@@ -243 +244 @@
         ASSERT(THREAD);
         ASSERT(framep);
-        ASSERT(!(flags & ~FRAME_NO_RESERVE));
+        ASSERT(!(flags & ~(FRAME_NO_RESERVE | FRAME_ATOMIC)));
 
         /*
@@ -255 +256 @@
                 ASSERT(page);   // FIXME
         } else {
-                frame = (uintptr_t) frame_alloc_noreserve(ONE_FRAME,
-                    FRAME_LOWMEM);
+                frame = (uintptr_t) frame_alloc(ONE_FRAME,
+                    FRAME_LOWMEM | flags);
+                if (!frame)
+                        return (uintptr_t) NULL;
                 page = PA2KA(frame);
         }