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

Timestamp:

2011-08-21T12:04:27Z (14 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/sysipc.c (modified) (3 diffs)

kernel/generic/src/ipc/sysipc.c

@@ -54 +54 @@
 #include <mm/as.h>
 #include <print.h>
+#include <macros.h>
 
 /**
@@ -252 +253 @@
                         /* The connection was accepted */
                         phone_connect(phoneid, &answer->sender->answerbox);
-                        /* Set 'task hash' as arg4 of response */
-                        IPC_SET_ARG4(answer->data, (sysarg_t) TASK);
                         /* Set 'phone hash' as arg5 of response */
                         IPC_SET_ARG5(answer->data,
@@ -375 +374 @@
                                     IPC_GET_ARG2(*olddata),
                                     IPC_GET_ARG3(*olddata),
-                                    (sysarg_t) olddata->task,
-                                    (sysarg_t) TASK);
+                                    LOWER32(olddata->task_id),
+                                    UPPER32(olddata->task_id));
                                 IPC_SET_RETVAL(answer->data, rc);
                         }