Changeset c621f4aa in mainline for kernel/generic/src/ipc/event.c

Timestamp:

2010-07-25T10:11:13Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

377cce8

Parents:

24a2517 (diff), a2da43c (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 with mainline.

File:

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

kernel/generic/src/ipc/event.c

@@ -38 +38 @@
 #include <ipc/event_types.h>
 #include <mm/slab.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <synch/spinlock.h>
 #include <console/console.h>
@@ -137 +137 @@
                         IPC_SET_ARG5(call->data, a5);
                         
-                        ipl_t ipl = interrupts_disable();
-                        spinlock_lock(&events[evno].answerbox->irq_lock);
+                        irq_spinlock_lock(&events[evno].answerbox->irq_lock, true);
                         list_append(&call->link, &events[evno].answerbox->irq_notifs);
-                        spinlock_unlock(&events[evno].answerbox->irq_lock);
-                        interrupts_restore(ipl);
+                        irq_spinlock_unlock(&events[evno].answerbox->irq_lock, true);
                         
                         waitq_wakeup(&events[evno].answerbox->wq, WAKEUP_FIRST);