Changeset 2e9eae2 in mainline for generic/src/mm/frame.c

Timestamp:

2006-06-23T16:03:53Z (19 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

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

Children:

757551a3

Parents:

a832dd7

Message:

Changed interface of frame_alloc/free to use address of frame instead of the pfn.
This makes it impossible to use >4GB of memory on 32-bit machines, but who cares…

File:

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

generic/src/mm/frame.c

@@ -929 +929 @@
  * @param pzone  Preferred zone
  *
- * @return Allocated frame.
- *
- */
-pfn_t frame_alloc_generic(__u8 order, int flags, int *status, int *pzone) 
+ * @return Physical address of the allocated frame.
+ *
+ */
+void * frame_alloc_generic(__u8 order, int flags, int *status, int *pzone) 
 {
         ipl_t ipl;
@@ -972 +972 @@
                         if (status)
                                 *status = FRAME_NO_MEMORY;
-                        return NULL;
+                        return 0;
                 }
                 
@@ -987 +987 @@
         if (status)
                 *status = FRAME_OK;
-        return v;
+
+        if (flags & FRAME_KA)
+                return (void *)PA2KA(PFN2ADDR(v));
+        return (void *)PFN2ADDR(v);
 }
 
@@ -996 +999 @@
  * If it drops to zero, move the frame structure to free list.
  *
- * @param pfn Frame number of the frame to be freed.
- */
-void frame_free(pfn_t pfn)
+ * @param Frame Physical Address of of the frame to be freed.
+ */
+void frame_free(__address frame)
 {
         ipl_t ipl;
         zone_t *zone;
+        pfn_t pfn = ADDR2PFN(frame);
 
         ipl = interrupts_disable();