Changeset 864b0dd in mainline

Timestamp:

2011-04-21T19:23:00Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

010be476

Parents:

164c653

Message:

Always use reserve_force_alloc() in frame_alloc_generic(), even when
FRAME_ATOMIC was specified. This guarantess that in case of memory shortage,
the frame allocator will attempt to reclaim memory from the slab allocator.

File:

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

kernel/generic/src/mm/frame.c

@@ -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);