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

Timestamp:

2012-01-05T17:49:20Z (12 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

0a549cc

Parents:

9f0fb84

Message:

zone_external_conf_alloc() must be allowed to fail gracefully (by passing FRAME_ATOMIC to frame_alloc()), otherwise the frame_alloc_generic() might panic on the "Cannot wait for memory to become available" assertion in specific memory configurations

File:

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

kernel/generic/src/mm/frame.c

@@ -870 +870 @@
         size_t order = ispwr2(size) ? fnzb(size) : (fnzb(size) + 1);
 
-        return ADDR2PFN((uintptr_t) frame_alloc(order - FRAME_WIDTH, FRAME_LOWMEM));
+        return ADDR2PFN((uintptr_t) frame_alloc(order - FRAME_WIDTH,
+            FRAME_LOWMEM | FRAME_ATOMIC));
 }