Changeset 371bd7d in mainline for kernel/generic/src/ddi

Timestamp:

2010-03-27T09:22:17Z (16 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

36a75a2

Parents:

cd82bb1 (diff), eaf22d4 (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.

Location:

kernel/generic/src/ddi

Files:

• ddi.c (modified) (2 diffs)
• device.c (modified) (1 diff)
• irq.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;

kernel/generic/src/ddi/device.c

@@ -35 +35 @@
  */
 
-#include <arch/types.h>
+#include <typedefs.h>
 #include <ddi/device.h>
 #include <atomic.h>

kernel/generic/src/ddi/irq.c

@@ -71 +71 @@
 #include <adt/hash_table.h>
 #include <mm/slab.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <synch/spinlock.h>
 #include <console/console.h>
+#include <interrupt.h>
 #include <memstr.h>
 #include <arch.h>
@@ -169 +170 @@
         irq->inr = -1;
         irq->devno = -1;
+
+        irq_initialize_arch(irq);
 }