Changeset b838fdf in mainline

Timestamp:

2011-01-14T20:09:24Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

630a8ef

Parents:

e608cbe

Message:

Deploy the noreserve functions in address space area backends that allocate physical memory.

Location:

kernel/generic/src/mm

Files:

• backend_anon.c (modified) (3 diffs)
• backend_elf.c (modified) (5 diffs)

kernel/generic/src/mm/backend_anon.c

@@ -115 +115 @@
                         }
                         if (allocate) {
-                                frame = (uintptr_t) frame_alloc(ONE_FRAME, 0);
+                                frame = (uintptr_t) frame_alloc_noreserve(
+                                    ONE_FRAME, 0);
                                 memsetb((void *) PA2KA(frame), FRAME_SIZE, 0);
                                 
@@ -145 +146 @@
                  *   the different causes
                  */
-                frame = (uintptr_t) frame_alloc(ONE_FRAME, 0);
+                frame = (uintptr_t) frame_alloc_noreserve(ONE_FRAME, 0);
                 memsetb((void *) PA2KA(frame), FRAME_SIZE, 0);
         }
@@ -174 +175 @@
         ASSERT(mutex_locked(&area->lock));
 
-        frame_free(frame);
+        frame_free_noreserve(frame);
 }
 

kernel/generic/src/mm/backend_elf.c

@@ -153 +153 @@
                  */
                 if (entry->p_flags & PF_W) {
-                        frame = (uintptr_t)frame_alloc(ONE_FRAME, 0);
+                        frame = (uintptr_t)frame_alloc_noreserve(ONE_FRAME, 0);
                         memcpy((void *) PA2KA(frame),
                             (void *) (base + i * FRAME_SIZE), FRAME_SIZE);
@@ -171 +171 @@
                  * and cleared.
                  */
-                frame = (uintptr_t)frame_alloc(ONE_FRAME, 0);
+                frame = (uintptr_t) frame_alloc_noreserve(ONE_FRAME, 0);
                 memsetb((void *) PA2KA(frame), FRAME_SIZE, 0);
                 dirty = true;
@@ -193 +193 @@
                         pad_hi = 0;
 
-                frame = (uintptr_t)frame_alloc(ONE_FRAME, 0);
+                frame = (uintptr_t) frame_alloc_noreserve(ONE_FRAME, 0);
                 memcpy((void *) (PA2KA(frame) + pad_lo),
                     (void *) (base + i * FRAME_SIZE + pad_lo),
@@ -252 +252 @@
                          * data.
                          */
-                        frame_free(frame);
+                        frame_free_noreserve(frame);
                 }
         } else {
@@ -260 +260 @@
                  * anonymous). In any case, a frame needs to be freed.
                  */
-                frame_free(frame);
+                frame_free_noreserve(frame);
         }
 }