Changes in kernel/generic/src/ddi/ddi.c [f430f58:a422bc5] in mainline

File:

• kernel/generic/src/ddi/ddi.c (modified) (10 diffs)

kernel/generic/src/ddi/ddi.c

@@ -46 +46 @@
 #include <mm/frame.h>
 #include <mm/as.h>
-#include <synch/spinlock.h>
+#include <synch/mutex.h>
 #include <syscall/copy.h>
 #include <adt/btree.h>
@@ -54 +54 @@
 
 /** This lock protects the parea_btree. */
-SPINLOCK_INITIALIZE(parea_lock);
+static mutex_t parea_lock;
 
 /** B+tree with enabled physical memory areas. */
@@ -63 +63 @@
 {
         btree_create(&parea_btree);
+        mutex_initialize(&parea_lock, MUTEX_PASSIVE);
 }
 
@@ -72 +73 @@
 void ddi_parea_register(parea_t *parea)
 {
-        ipl_t ipl = interrupts_disable();
-        spinlock_lock(&parea_lock);
+        mutex_lock(&parea_lock);
         
         /*
@@ -80 +80 @@
         btree_insert(&parea_btree, (btree_key_t) parea->pbase, parea, NULL);
         
-        spinlock_unlock(&parea_lock);
-        interrupts_restore(ipl);
+        mutex_unlock(&parea_lock);
 }
 
@@ -141 +140 @@
                 spinlock_unlock(&zones.lock);
                 
-                spinlock_lock(&parea_lock);
+                mutex_lock(&parea_lock);
                 btree_node_t *nodep;
                 parea_t *parea = (parea_t *) btree_search(&parea_btree,
@@ -147 +146 @@
                 
                 if ((!parea) || (parea->frames < pages)) {
-                        spinlock_unlock(&parea_lock);
+                        mutex_unlock(&parea_lock);
                         goto err;
                 }
                 
-                spinlock_unlock(&parea_lock);
+                mutex_unlock(&parea_lock);
                 goto map;
         }
@@ -161 +160 @@
         
 map:
-        spinlock_lock(&TASK->lock);
-        
+        interrupts_restore(ipl);
+
         if (!as_area_create(TASK->as, flags, pages * PAGE_SIZE, vp,
             AS_AREA_ATTR_NONE, &phys_backend, &backend_data)) {
@@ -169 +168 @@
                  * We report it using ENOMEM.
                  */
-                spinlock_unlock(&TASK->lock);
-                interrupts_restore(ipl);
                 return ENOMEM;
         }
@@ -177 +174 @@
          * Mapping is created on-demand during page fault.
          */
-        
-        spinlock_unlock(&TASK->lock);
-        interrupts_restore(ipl);
         return 0;
 }