Changes in kernel/generic/src/mm/frame.c [8cbf1c3:aaceebc4] in mainline

File:

• kernel/generic/src/mm/frame.c (modified) (4 diffs)

kernel/generic/src/mm/frame.c

@@ -873 +873 @@
 
         return ADDR2PFN((uintptr_t) frame_alloc(order - FRAME_WIDTH,
-            FRAME_LOWMEM | FRAME_ATOMIC, 0));
+            FRAME_LOWMEM | FRAME_ATOMIC));
 }
 
@@ -1024 +1024 @@
  *
  */
-uintptr_t frame_alloc_generic(uint8_t order, frame_flags_t flags,
-    uintptr_t constraint, size_t *pzone)
+void *frame_alloc_generic(uint8_t order, frame_flags_t flags, size_t *pzone)
 {
         size_t size = ((size_t) 1) << order;
@@ -1072 +1071 @@
                         if (!(flags & FRAME_NO_RESERVE))
                                 reserve_free(size);
-                        return 0;
+                        return NULL;
                 }
                 
@@ -1127 +1126 @@
                 *pzone = znum;
         
-        return PFN2ADDR(pfn);
-}
-
-uintptr_t frame_alloc(uint8_t order, frame_flags_t flags, uintptr_t constraint)
-{
-        return frame_alloc_generic(order, flags, constraint, NULL);
-}
-
-uintptr_t frame_alloc_noreserve(uint8_t order, frame_flags_t flags,
-    uintptr_t constraint)
-{
-        return frame_alloc_generic(order, flags | FRAME_NO_RESERVE, constraint,
-            NULL);
+        if (flags & FRAME_KA)
+                return (void *) PA2KA(PFN2ADDR(pfn));
+        
+        return (void *) PFN2ADDR(pfn);
+}
+
+void *frame_alloc(uint8_t order, frame_flags_t flags)
+{
+        return frame_alloc_generic(order, flags, NULL);
+}
+
+void *frame_alloc_noreserve(uint8_t order, frame_flags_t flags)
+{
+        return frame_alloc_generic(order, flags | FRAME_NO_RESERVE, NULL);
 }