Changes in kernel/generic/src/mm/frame.c [5ecac7e:d1582b50] in mainline

File:

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

kernel/generic/src/mm/frame.c

@@ -370 +370 @@
 {
         assert(zone->flags & ZONE_AVAILABLE);
-        assert(zone->free_count >= count);
 
         /* Allocate frames from zone */
@@ -411 +410 @@
 
         frame_t *frame = zone_get_frame(zone, index);
+
         assert(frame->refcount > 0);
 
         if (!--frame->refcount) {
-                assert(zone->busy_count > 0);
-
                 bitmap_set(&zone->bitmap, index, 0);
 
@@ -434 +432 @@
 
         frame_t *frame = zone_get_frame(zone, index);
-        assert(frame->refcount <= 1);
-
         if (frame->refcount > 0)
                 return;
 
-        assert(zone->free_count > 0);
-
         frame->refcount = 1;
         bitmap_set_range(&zone->bitmap, index, 1);
@@ -446 +440 @@
         zone->free_count--;
         reserve_force_alloc(1);
-}
-
-/** Mark frame in zone available to allocation. */
-_NO_TRACE static void zone_mark_available(zone_t *zone, size_t index)
-{
-        assert(zone->flags & ZONE_AVAILABLE);
-
-        frame_t *frame = zone_get_frame(zone, index);
-        assert(frame->refcount == 1);
-
-        frame->refcount = 0;
-        bitmap_set_range(&zone->bitmap, index, 0);
-
-        zone->free_count++;
 }
 
@@ -485 +465 @@
         /* Difference between zone bases */
         pfn_t base_diff = zones.info[z2].base - zones.info[z1].base;
-        pfn_t gap = base_diff - zones.info[z1].count;
 
         zones.info[z1].count = base_diff + zones.info[z2].count;
@@ -513 +492 @@
                     zones.info[z2].frames[i];
         }
-
-        /*
-         * Mark the gap between the original zones as unavailable.
-         */
-
-        for (size_t i = 0; i < gap; i++) {
-                frame_initialize(&zones.info[z1].frames[old_z1->count + i]);
-                zone_mark_unavailable(&zones.info[z1], old_z1->count + i);
-        }
 }
 
@@ -548 +518 @@
 
         for (size_t i = 0; i < cframes; i++)
-                zone_mark_available(&zones.info[znum],
+                (void) zone_frame_free(&zones.info[znum],
                     pfn - zones.info[znum].base + i);
 }