Changeset d1e196f7 in mainline for kernel/generic/src/ipc/ipc.c

Timestamp:

2011-08-21T12:04:27Z (13 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

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

Children:

8a6ba94

Parents:

1877128 (diff), a6480d5 (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/ipc.c (modified) (3 diffs)

kernel/generic/src/ipc/ipc.c

@@ -230 +230 @@
                 }
         }
+
+        call->data.task_id = TASK->taskid;
         
         if (do_lock)
@@ -294 +296 @@
                 atomic_inc(&phone->active_calls);
                 call->data.phone = phone;
-                call->data.task = TASK;
+                call->data.task_id = TASK->taskid;
         }
         
@@ -406 +408 @@
                         call->caller_phone = call->data.phone;
                 call->data.phone = newphone;
-                call->data.task = TASK;
+                call->data.task_id = TASK->taskid;
         }