Index: kernel/generic/src/sysinfo/sysinfo.c
===================================================================
--- kernel/generic/src/sysinfo/sysinfo.c	(revision 90dd8aee8dfa4483459e2aba9af781156d93a7f7)
+++ kernel/generic/src/sysinfo/sysinfo.c	(revision b487b956a3010a8d3ca2e927f2fd2f5d7786eb07)
@@ -34,14 +34,14 @@
  */
 
+#include <arch/asm.h>
 #include <assert.h>
-#include <sysinfo/sysinfo.h>
+#include <errno.h>
+#include <macros.h>
 #include <mm/slab.h>
 #include <stdio.h>
+#include <stdlib.h>
+#include <synch/mutex.h>
 #include <syscall/copy.h>
-#include <synch/mutex.h>
-#include <arch/asm.h>
-#include <errno.h>
-#include <macros.h>
-#include <stdlib.h>
+#include <sysinfo/sysinfo.h>
 
 /** Maximal sysinfo path length */
@@ -57,5 +57,5 @@
 
 /** Sysinfo lock */
-static IRQ_SPINLOCK_INITIALIZE(sysinfo_lock);
+static MUTEX_INITIALIZE(sysinfo_lock, MUTEX_PASSIVE);
 
 /** Sysinfo item constructor
@@ -327,5 +327,5 @@
 {
 	/* Protect sysinfo tree consistency */
-	irq_spinlock_lock(&sysinfo_lock, true);
+	mutex_lock(&sysinfo_lock);
 
 	if (root == NULL)
@@ -340,5 +340,5 @@
 	}
 
-	irq_spinlock_unlock(&sysinfo_lock, true);
+	mutex_unlock(&sysinfo_lock);
 }
 
@@ -360,5 +360,5 @@
 {
 	/* Protect sysinfo tree consistency */
-	irq_spinlock_lock(&sysinfo_lock, true);
+	mutex_lock(&sysinfo_lock);
 
 	if (root == NULL)
@@ -374,5 +374,5 @@
 	}
 
-	irq_spinlock_unlock(&sysinfo_lock, true);
+	mutex_unlock(&sysinfo_lock);
 }
 
@@ -390,5 +390,5 @@
 {
 	/* Protect sysinfo tree consistency */
-	irq_spinlock_lock(&sysinfo_lock, true);
+	mutex_lock(&sysinfo_lock);
 
 	if (root == NULL)
@@ -404,5 +404,5 @@
 	}
 
-	irq_spinlock_unlock(&sysinfo_lock, true);
+	mutex_unlock(&sysinfo_lock);
 }
 
@@ -425,5 +425,5 @@
 {
 	/* Protect sysinfo tree consistency */
-	irq_spinlock_lock(&sysinfo_lock, true);
+	mutex_lock(&sysinfo_lock);
 
 	if (root == NULL)
@@ -439,5 +439,5 @@
 	}
 
-	irq_spinlock_unlock(&sysinfo_lock, true);
+	mutex_unlock(&sysinfo_lock);
 }
 
@@ -452,5 +452,5 @@
 {
 	/* Protect sysinfo tree consistency */
-	irq_spinlock_lock(&sysinfo_lock, true);
+	mutex_lock(&sysinfo_lock);
 
 	if (root == NULL)
@@ -463,5 +463,5 @@
 		printf("Could not set sysinfo item %s.\n", name);
 
-	irq_spinlock_unlock(&sysinfo_lock, true);
+	mutex_unlock(&sysinfo_lock);
 }
 
@@ -479,5 +479,5 @@
 {
 	/* Protect sysinfo tree consistency */
-	irq_spinlock_lock(&sysinfo_lock, true);
+	mutex_lock(&sysinfo_lock);
 
 	if (root == NULL)
@@ -498,5 +498,5 @@
 	}
 
-	irq_spinlock_unlock(&sysinfo_lock, true);
+	mutex_unlock(&sysinfo_lock);
 }
 
@@ -596,5 +596,5 @@
 	 * while we are dumping it
 	 */
-	irq_spinlock_lock(&sysinfo_lock, true);
+	mutex_lock(&sysinfo_lock);
 
 	if (root == NULL)
@@ -603,5 +603,5 @@
 		sysinfo_dump_internal(root, 0);
 
-	irq_spinlock_unlock(&sysinfo_lock, true);
+	mutex_unlock(&sysinfo_lock);
 }
 
@@ -695,7 +695,7 @@
 		 * are reading it.
 		 */
-		irq_spinlock_lock(&sysinfo_lock, true);
+		mutex_lock(&sysinfo_lock);
 		ret = sysinfo_get_item(path, NULL, dry_run);
-		irq_spinlock_unlock(&sysinfo_lock, true);
+		mutex_unlock(&sysinfo_lock);
 	}
 
@@ -806,7 +806,7 @@
 		 * are reading it.
 		 */
-		irq_spinlock_lock(&sysinfo_lock, true);
+		mutex_lock(&sysinfo_lock);
 		ret = sysinfo_get_keys(path, NULL, dry_run);
-		irq_spinlock_unlock(&sysinfo_lock, true);
+		mutex_unlock(&sysinfo_lock);
 	}