Changes in / [0d8a304:0496c17] in mainline

Location:

kernel/generic

Files:

• include/mm/frame.h (modified) (1 diff)
• include/mm/reserve.h (modified) (1 diff)
• src/main/main.c (modified) (2 diffs)
• src/mm/frame.c (modified) (4 diffs)
• src/mm/reserve.c (modified) (1 diff)

kernel/generic/include/mm/frame.h

@@ -164 +164 @@
 extern void frame_free_noreserve(uintptr_t);
 extern void frame_reference_add(pfn_t);
-extern size_t frame_total_free_get(void);
 
 extern size_t find_zone(pfn_t, size_t, size_t);

kernel/generic/include/mm/reserve.h

@@ -38 +38 @@
 #include <typedefs.h>
 
-extern void reserve_init(void);
 extern bool reserve_try_alloc(size_t);
 extern void reserve_force_alloc(size_t);

kernel/generic/src/main/main.c

@@ -71 +71 @@
 #include <mm/as.h>
 #include <mm/slab.h>
-#include <mm/reserve.h>
 #include <synch/waitq.h>
 #include <synch/futex.h>
@@ -218 +217 @@
         ddi_init();
         arch_post_mm_init();
-        reserve_init();
         arch_pre_smp_init();
         smp_init();

kernel/generic/src/mm/frame.c

@@ -182 +182 @@
  *
  */
-NO_TRACE static size_t frame_total_free_get_internal(void)
+#ifdef CONFIG_DEBUG
+NO_TRACE static size_t total_frames_free(void)
 {
         size_t total = 0;
         size_t i;
-
         for (i = 0; i < zones.count; i++)
                 total += zones.info[i].free_count;
@@ -192 +192 @@
         return total;
 }
-
-NO_TRACE size_t frame_total_free_get(void)
-{
-        size_t total;
-
-        irq_spinlock_lock(&zones.lock, true);
-        total = frame_total_free_get_internal();
-        irq_spinlock_unlock(&zones.lock, true);
-
-        return total;
-}
-
+#endif /* CONFIG_DEBUG */
 
 /** Find a zone with a given frames.
@@ -851 +840 @@
                         buddy_system_free(zone->buddy_system, &zone->frames[i].buddy_link);
                 }
+
+                /* "Unreserve" new frames. */
+                reserve_free(count);
         } else
                 zone->frames = NULL;
@@ -1059 +1051 @@
                 
 #ifdef CONFIG_DEBUG
-                size_t avail = frame_total_free_get_internal();
+                size_t avail = total_frames_free();
 #endif
                 

kernel/generic/src/mm/reserve.c

@@ -45 +45 @@
 IRQ_SPINLOCK_STATIC_INITIALIZE_NAME(reserve_lock, "reserve_lock");
 static ssize_t reserve = 0;
-
-/** Initialize memory reservations tracking.
- *
- * This function must be called after frame zones are created and merged
- * and before any address space area is created.
- */
-void reserve_init(void)
-{
-        reserve = frame_total_free_get();
-}
 
 /** Try to reserve memory.