Changeset c0d814a in mainline for kernel/generic/src/sysinfo/sysinfo.c

Timestamp:

2025-04-10T20:02:30Z (4 days ago)

Author:

GitHub <noreply@…>

Children:

b8b031f

Parents:

a92290d (diff), 90dd8aee (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-10 20:02:30)

git-committer:

GitHub <noreply@…> (2025-04-10 20:02:30)

Message:

Merge pull request #6 from HelenOS/master

Merge pending changes from downstream helenos/master

File:

• kernel/generic/src/sysinfo/sysinfo.c (modified) (17 diffs)

kernel/generic/src/sysinfo/sysinfo.c

@@ -57 +57 @@
 
 /** Sysinfo lock */
-static MUTEX_INITIALIZE(sysinfo_lock, MUTEX_ACTIVE);
+static IRQ_SPINLOCK_INITIALIZE(sysinfo_lock);
 
 /** Sysinfo item constructor
@@ -327 +327 @@
 {
         /* Protect sysinfo tree consistency */
-        mutex_lock(&sysinfo_lock);
+        irq_spinlock_lock(&sysinfo_lock, true);
 
         if (root == NULL)
@@ -340 +340 @@
         }
 
-        mutex_unlock(&sysinfo_lock);
+        irq_spinlock_unlock(&sysinfo_lock, true);
 }
 
@@ -360 +360 @@
 {
         /* Protect sysinfo tree consistency */
-        mutex_lock(&sysinfo_lock);
+        irq_spinlock_lock(&sysinfo_lock, true);
 
         if (root == NULL)
@@ -374 +374 @@
         }
 
-        mutex_unlock(&sysinfo_lock);
+        irq_spinlock_unlock(&sysinfo_lock, true);
 }
 
@@ -390 +390 @@
 {
         /* Protect sysinfo tree consistency */
-        mutex_lock(&sysinfo_lock);
+        irq_spinlock_lock(&sysinfo_lock, true);
 
         if (root == NULL)
@@ -404 +404 @@
         }
 
-        mutex_unlock(&sysinfo_lock);
+        irq_spinlock_unlock(&sysinfo_lock, true);
 }
 
@@ -425 +425 @@
 {
         /* Protect sysinfo tree consistency */
-        mutex_lock(&sysinfo_lock);
+        irq_spinlock_lock(&sysinfo_lock, true);
 
         if (root == NULL)
@@ -439 +439 @@
         }
 
-        mutex_unlock(&sysinfo_lock);
+        irq_spinlock_unlock(&sysinfo_lock, true);
 }
 
@@ -452 +452 @@
 {
         /* Protect sysinfo tree consistency */
-        mutex_lock(&sysinfo_lock);
+        irq_spinlock_lock(&sysinfo_lock, true);
 
         if (root == NULL)
@@ -463 +463 @@
                 printf("Could not set sysinfo item %s.\n", name);
 
-        mutex_unlock(&sysinfo_lock);
+        irq_spinlock_unlock(&sysinfo_lock, true);
 }
 
@@ -479 +479 @@
 {
         /* Protect sysinfo tree consistency */
-        mutex_lock(&sysinfo_lock);
+        irq_spinlock_lock(&sysinfo_lock, true);
 
         if (root == NULL)
@@ -498 +498 @@
         }
 
-        mutex_unlock(&sysinfo_lock);
+        irq_spinlock_unlock(&sysinfo_lock, true);
 }
 
@@ -596 +596 @@
          * while we are dumping it
          */
-        mutex_lock(&sysinfo_lock);
+        irq_spinlock_lock(&sysinfo_lock, true);
 
         if (root == NULL)
@@ -603 +603 @@
                 sysinfo_dump_internal(root, 0);
 
-        mutex_unlock(&sysinfo_lock);
+        irq_spinlock_unlock(&sysinfo_lock, true);
 }
 
@@ -695 +695 @@
                  * are reading it.
                  */
-                mutex_lock(&sysinfo_lock);
+                irq_spinlock_lock(&sysinfo_lock, true);
                 ret = sysinfo_get_item(path, NULL, dry_run);
-                mutex_unlock(&sysinfo_lock);
+                irq_spinlock_unlock(&sysinfo_lock, true);
         }
 
@@ -806 +806 @@
                  * are reading it.
                  */
-                mutex_lock(&sysinfo_lock);
+                irq_spinlock_lock(&sysinfo_lock, true);
                 ret = sysinfo_get_keys(path, NULL, dry_run);
-                mutex_unlock(&sysinfo_lock);
+                irq_spinlock_unlock(&sysinfo_lock, true);
         }