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

Timestamp:

2010-11-02T18:29:01Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

4f35b9ff

Parents:

76e1121f (diff), 28f4adb (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/ipc/kbox.c (modified) (1 diff)

kernel/generic/src/ipc/kbox.c

@@ -107 +107 @@
                 /* Terminate debugging session (if any). */
                 LOG("Terminate debugging session.");
-                irq_spinlock_lock(&TASK->lock, true);
+                mutex_lock(&TASK->udebug.lock);
                 udebug_task_cleanup(TASK);
-                irq_spinlock_unlock(&TASK->lock, true);
+                mutex_unlock(&TASK->udebug.lock);
         } else {
                 LOG("Was not debugger.");