Changeset 7da90cd in mainline for kernel/generic/src/mm/frame.c

Timestamp:

2011-04-21T19:30:49Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

74c8f344

Parents:

c7bbf029 (diff), 010be476 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge from lp:~jakub/helenos/mm.

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 = 1 << frame->buddy_order;
+        size_t size = 0;
         
         ASSERT(frame->refcount);
         
         if (!--frame->refcount) {
-                buddy_system_free(zone->buddy_system, &frame->buddy_link);
-                
+                size = 1 << frame->buddy_order;
+                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)) {
-                if (flags & FRAME_ATOMIC) {
-                        if (!reserve_try_alloc(size))
-                                return NULL;
-                } else {
-                        reserve_force_alloc(size);
-                }
-        }
-        
+        if (!(flags & FRAME_NO_RESERVE)) 
+                reserve_force_alloc(size);
+
 loop:
         irq_spinlock_lock(&zones.lock, true);