Changeset 8cbf1c3 in mainline for kernel/generic/src/mm/km.c

Timestamp:

2013-09-09T23:13:10Z (12 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

e2a0d76

Parents:

c67dbd6

Message:

prepare the public API of the frame allocator for the new backend
remove FRAME_KA (can be easily implemented explicitly)

File:

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

kernel/generic/src/mm/km.c

@@ -249 +249 @@
          * Allocate a frame, preferably from high memory.
          */
-        frame = (uintptr_t) frame_alloc(ONE_FRAME,
-            FRAME_HIGHMEM | FRAME_ATOMIC | flags); 
+        frame = frame_alloc(ONE_FRAME,
+            FRAME_HIGHMEM | FRAME_ATOMIC | flags, 0); 
         if (frame) {
                 page = km_map(frame, PAGE_SIZE,
@@ -256 +256 @@
                 ASSERT(page);   // FIXME
         } else {
-                frame = (uintptr_t) frame_alloc(ONE_FRAME,
-                    FRAME_LOWMEM | flags);
+                frame = frame_alloc(ONE_FRAME, FRAME_LOWMEM | flags, 0);
                 if (!frame)
                         return (uintptr_t) NULL;