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

Timestamp:

2010-02-17T19:19:08Z (15 years ago)

Author:

Lukas Mejdrech <lukasmejdrech@…>

Branches:

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

Children:

1e2e0c1e

Parents:

01a9ef5 (diff), b8da2a3 (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.

File:

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

kernel/generic/src/ddi/ddi.c

@@ -146 +146 @@
                     (btree_key_t) pf, &nodep);
                 
-                if ((!parea) || (parea->frames < pages))
+                if ((!parea) || (parea->frames < pages)) {
+                        spinlock_unlock(&parea_lock);
                         goto err;
+                }
                 
                 spinlock_unlock(&parea_lock);
@@ -153 +155 @@
         }
         
+        spinlock_unlock(&zones.lock);
 err:
-        spinlock_unlock(&zones.lock);
         interrupts_restore(ipl);
         return ENOENT;