Changes in kernel/generic/src/mm/frame.c [597fa24:6188fee] in mainline

File:

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

kernel/generic/src/mm/frame.c

@@ -63 +63 @@
 #include <proc/thread.h> /* THREAD */
 
-zones_t zones = {
-        .count = 0,
-        .lock = IRQ_SPINLOCK_INITIALIZER("frame.zones.lock"),
-};
+zones_t zones;
 
 /*
@@ -72 +69 @@
  * available.
  */
-static MUTEX_INITIALIZE(mem_avail_mtx, MUTEX_ACTIVE);
-static CONDVAR_INITIALIZE(mem_avail_cv);
+static mutex_t mem_avail_mtx;
+static condvar_t mem_avail_cv;
 static size_t mem_avail_req = 0;  /**< Number of frames requested. */
 static size_t mem_avail_gen = 0;  /**< Generation counter. */
@@ -1111 +1108 @@
 void frame_init(void)
 {
+        if (config.cpu_active == 1) {
+                zones.count = 0;
+                irq_spinlock_initialize(&zones.lock, "frame.zones.lock");
+                mutex_initialize(&mem_avail_mtx, MUTEX_ACTIVE);
+                condvar_initialize(&mem_avail_cv);
+        }
+
         /* Tell the architecture to create some memory */
         frame_low_arch_init();