Changes in kernel/generic/src/mm/frame.c [864b0dd:d060900] in mainline

File:

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

kernel/generic/src/mm/frame.c

@@ -481 +481 @@
         
         frame_t *frame = &zone->frames[frame_idx];
-        size_t size = 0;
+        size_t size = 1 << frame->buddy_order;
         
         ASSERT(frame->refcount);
         
         if (!--frame->refcount) {
-                size = 1 << frame->buddy_order;
-                buddy_system_free(zone->buddy_system, &frame->buddy_link);              
+                buddy_system_free(zone->buddy_system, &frame->buddy_link);
+                
                 /* Update zone information. */
                 zone->free_count += size;
@@ -1007 +1007 @@
          * If not told otherwise, we must first reserve the memory.
          */
-        if (!(flags & FRAME_NO_RESERVE)) 
-                reserve_force_alloc(size);
-
+        if (!(flags & FRAME_NO_RESERVE)) {
+                if (flags & FRAME_ATOMIC) {
+                        if (!reserve_try_alloc(size))
+                                return NULL;
+                } else {
+                        reserve_force_alloc(size);
+                }
+        }
+        
 loop:
         irq_spinlock_lock(&zones.lock, true);