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

Timestamp:

2012-10-23T13:16:49Z (12 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

6ecf5b8

Parents:

32b3a12 (diff), b2ac3998 (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) (4 diffs)

kernel/generic/src/proc/task.c

@@ -161 +161 @@
         size_t i;
         for (i = 0; i < IPC_MAX_PHONES; i++)
-                ipc_phone_init(&task->phones[i]);
+                ipc_phone_init(&task->phones[i], task);
+
+        spinlock_initialize(&task->active_calls_lock, "active_calls_lock");
+        list_initialize(&task->active_calls);
         
 #ifdef CONFIG_UDEBUG
@@ -203 +206 @@
         event_task_init(task);
         
+        task->answerbox.active = true;
+
 #ifdef CONFIG_UDEBUG
         /* Init debugging stuff */
@@ -208 +213 @@
         
         /* Init kbox stuff */
+        task->kb.box.active = true;
         task->kb.finished = false;
 #endif
@@ -213 +219 @@
         if ((ipc_phone_0) &&
             (container_check(ipc_phone_0->task->container, task->container)))
-                ipc_phone_connect(&task->phones[0], ipc_phone_0);
+                (void) ipc_phone_connect(&task->phones[0], ipc_phone_0);
         
         btree_create(&task->futexes);