Changeset 9f945464 in mainline for kernel/generic/src/mm/frame.c

Timestamp:

2025-04-09T16:36:30Z (6 days ago)

Author:

GitHub <noreply@…>

Children:

3acb63b5

Parents:

2c94501 (diff), 597fa24 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Wayne Thornton <wmthornton-dev@…> (2025-04-09 16:36:30)

git-committer:

GitHub <noreply@…> (2025-04-09 16:36:30)

Message:

Merge pull request #3 from HelenOS/master

Enable static initialization of kernel synchronization primitives

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;
+zones_t zones = {
+        .count = 0,
+        .lock = IRQ_SPINLOCK_INITIALIZER("frame.zones.lock"),
+};
 
 /*
@@ -69 +72 @@
  * available.
  */
-static mutex_t mem_avail_mtx;
-static condvar_t mem_avail_cv;
+static MUTEX_INITIALIZE(mem_avail_mtx, MUTEX_ACTIVE);
+static CONDVAR_INITIALIZE(mem_avail_cv);
 static size_t mem_avail_req = 0;  /**< Number of frames requested. */
 static size_t mem_avail_gen = 0;  /**< Generation counter. */
@@ -1108 +1111 @@
 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();