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

Timestamp:

2013-02-09T23:14:45Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

22dfd38

Parents:

b5d2e57 (diff), 005b765 (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.

Conflict resulting from bool.h → stdbool.h move and ddf structs turning opaque.
Fails to boot to shell console.

File:

• kernel/generic/src/proc/task.c (modified) (6 diffs)

kernel/generic/src/proc/task.c

@@ -156 +156 @@
         
         list_initialize(&task->threads);
-        list_initialize(&task->sync_boxes);
         
         ipc_answerbox_init(&task->answerbox, task);
@@ -162 +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
@@ -194 +196 @@
         task->ucycles = 0;
         task->kcycles = 0;
-        
+
         task->ipc_info.call_sent = 0;
         task->ipc_info.call_received = 0;
@@ -204 +206 @@
         event_task_init(task);
         
+        task->answerbox.active = true;
+
 #ifdef CONFIG_UDEBUG
         /* Init debugging stuff */
@@ -209 +213 @@
         
         /* Init kbox stuff */
+        task->kb.box.active = true;
         task->kb.finished = false;
 #endif
@@ -214 +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);