Changeset 5fb32c5 in mainline for kernel/generic/src/ipc/sysipc.c

Timestamp:

2011-08-20T09:05:14Z (13 years ago)

Author:

Petr Koupy <petr.koupy@…>

Branches:

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

Children:

c916dfc

Parents:

921b84f (diff), a0fc4be (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/sysipc.c (modified) (1 diff)

kernel/generic/src/ipc/sysipc.c

@@ -253 +253 @@
                         /* The connection was accepted */
                         phone_connect(phoneid, &answer->sender->answerbox);
-                        /* Set 'task ID' as arg3 and arg4 of response */
-                        IPC_SET_ARG3(answer->data, LOWER32(TASK->taskid));
-                        IPC_SET_ARG4(answer->data, UPPER32(TASK->taskid));
                         /* Set 'phone hash' as arg5 of response */
                         IPC_SET_ARG5(answer->data,