Changeset c47e1a8 in mainline for kernel/generic/src/ddi/ddi.c

Timestamp:

2010-05-21T07:50:04Z (15 years ago)

Author:

Lenka Trochtova <trochtova.lenka@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

d51ee2b

Parents:

cf8cc36 (diff), 15b592b (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.

Message:

merge mainline changes (rev. 451)

File:

• kernel/generic/src/ddi/ddi.c (modified) (8 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,
                     (btree_key_t) pf, &nodep);
                 
-                if ((!parea) || (parea->frames < pages))
+                if ((!parea) || (parea->frames < pages)) {
+                        mutex_unlock(&parea_lock);
                         goto err;
+                }
                 
-                spinlock_unlock(&parea_lock);
+                mutex_unlock(&parea_lock);
                 goto map;
         }
         
+        spinlock_unlock(&zones.lock);
 err:
-        spinlock_unlock(&zones.lock);
         interrupts_restore(ipl);
         return ENOENT;
         
 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)) {
@@ -167 +168 @@
                  * We report it using ENOMEM.
                  */
-                spinlock_unlock(&TASK->lock);
-                interrupts_restore(ipl);
                 return ENOMEM;
         }
@@ -175 +174 @@
          * Mapping is created on-demand during page fault.
          */
-        
-        spinlock_unlock(&TASK->lock);
-        interrupts_restore(ipl);
         return 0;
 }