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

Timestamp:

2012-01-16T22:45:38Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

32817cc, 3fe58d3c

Parents:

9117ef9b (diff), 3ea725e (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 mainline changes.

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