Changeset 2b95d13 in mainline for kernel/generic/src/proc/task.c

Timestamp:

2013-03-12T21:07:15Z (11 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

606f6a1

Parents:

976c434 (diff), eceff5f (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/proc/task.c (modified) (1 diff)

kernel/generic/src/proc/task.c

@@ -125 +125 @@
 {
         size_t tasks_left;
+
+        if (ipc_phone_0) {
+                task_t *task_0 = ipc_phone_0->task;
+                ipc_phone_0 = NULL;
+                /*
+                 * The first task is held by kinit(), we need to release it or
+                 * it will never finish cleanup.
+                 */
+                task_release(task_0);
+        }
         
         /* Repeat until there are any tasks except TASK */