Changes in kernel/generic/src/ipc/kbox.c [f173404:14ecd6c] in mainline

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;
 
@@ -77 +78 @@
          * kbox thread to clean it up since sender != debugger.
          */
-        mutex_lock(&TASK->udebug.lock);
+        ipl = interrupts_disable();
+        spinlock_lock(&TASK->lock);
         udebug_task_cleanup(TASK);
-        mutex_unlock(&TASK->udebug.lock);
-
+        spinlock_unlock(&TASK->lock);
+        interrupts_restore(ipl);
+        
         if (have_kb_thread) {
                 LOG("Join kb.thread.");
@@ -123 +126 @@
         ipc_answer(&TASK->kb.box, call);
 
-        mutex_lock(&TASK->kb.cleanup_lock);
-
         ipl = interrupts_disable();
         spinlock_lock(&TASK->lock);
@@ -135 +136 @@
 
                 /* 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. */
@@ -140 +142 @@
                         TASK->kb.thread = NULL;
                 }
+                mutex_unlock(&TASK->kb.cleanup_lock);
 
                 LOG("Phone list is empty.");
@@ -150 +153 @@
         spinlock_unlock(&TASK->lock);
         interrupts_restore(ipl);
-
-        mutex_unlock(&TASK->kb.cleanup_lock);
 }