Changeset 0c2d9bb in mainline for kernel/generic/src/mm/km.c

Timestamp:

2013-12-25T22:54:29Z (10 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

b51cf2c

Parents:

f7a33de (diff), ac36aed (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/km.c (modified) (1 diff)

kernel/generic/src/mm/km.c

@@ -239 +239 @@
 uintptr_t km_temporary_page_get(uintptr_t *framep, frame_flags_t flags)
 {
-        uintptr_t frame;
-        uintptr_t page;
-
         ASSERT(THREAD);
         ASSERT(framep);
         ASSERT(!(flags & ~(FRAME_NO_RESERVE | FRAME_ATOMIC)));
-
+        
         /*
          * Allocate a frame, preferably from high memory.
          */
-        frame = (uintptr_t) frame_alloc(ONE_FRAME,
-            FRAME_HIGHMEM | FRAME_ATOMIC | flags); 
+        uintptr_t page;
+        uintptr_t frame =
+            frame_alloc(1, FRAME_HIGHMEM | FRAME_ATOMIC | flags, 0);
         if (frame) {
                 page = km_map(frame, PAGE_SIZE,
                     PAGE_READ | PAGE_WRITE | PAGE_CACHEABLE);
-                ASSERT(page);   // FIXME
+                
+                // FIXME
+                ASSERT(page);
         } else {
-                frame = (uintptr_t) frame_alloc(ONE_FRAME,
-                    FRAME_LOWMEM | flags);
+                frame = frame_alloc(1, FRAME_LOWMEM | flags, 0);
                 if (!frame)
                         return (uintptr_t) NULL;
+                
                 page = PA2KA(frame);
         }
-
+        
         *framep = frame;
-        return page;    
+        return page;
 }