Changeset c47e1a8 in mainline for kernel/generic/src/ipc/kbox.c

Timestamp:

2010-05-21T07:50:04Z (16 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/ipc/kbox.c (modified) (6 diffs)

kernel/generic/src/ipc/kbox.c

@@ -47 +47 @@
 void ipc_kbox_cleanup(void)
 {
-        ipl_t ipl;
         bool have_kb_thread;
 
@@ -78 +77 @@
          * kbox thread to clean it up since sender != debugger.
          */
-        ipl = interrupts_disable();
-        spinlock_lock(&TASK->lock);
+        mutex_lock(&TASK->udebug.lock);
         udebug_task_cleanup(TASK);
-        spinlock_unlock(&TASK->lock);
-        interrupts_restore(ipl);
-        
+        mutex_unlock(&TASK->udebug.lock);
+
         if (have_kb_thread) {
                 LOG("Join kb.thread.");
@@ -126 +123 @@
         ipc_answer(&TASK->kb.box, call);
 
+        mutex_lock(&TASK->kb.cleanup_lock);
+
         ipl = interrupts_disable();
         spinlock_lock(&TASK->lock);
@@ -136 +135 @@
 
                 /* Only detach kbox thread unless already terminating. */
-                mutex_lock(&TASK->kb.cleanup_lock);
                 if (TASK->kb.finished == false) {
                         /* Detach kbox thread so it gets freed from memory. */
@@ -142 +140 @@
                         TASK->kb.thread = NULL;
                 }
-                mutex_unlock(&TASK->kb.cleanup_lock);
 
                 LOG("Phone list is empty.");
@@ -153 +150 @@
         spinlock_unlock(&TASK->lock);
         interrupts_restore(ipl);
+
+        mutex_unlock(&TASK->kb.cleanup_lock);
 }