Changeset d1e196f7 in mainline for kernel/generic/include/ipc/ipc.h

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/include/ipc/ipc.h (modified) (2 diffs)

kernel/generic/include/ipc/ipc.h

@@ -40 +40 @@
 #include <synch/mutex.h>
 #include <synch/waitq.h>
+#include <typedefs.h>
 
 #define IPC_MAX_PHONES  32
@@ -97 +98 @@
 typedef struct {
         sysarg_t args[IPC_CALL_LEN];
-        /** Task which made or forwarded the call with IPC_FF_ROUTE_FROM_ME. */
-        struct task *task;
+        /**
+         * Task which made or forwarded the call with IPC_FF_ROUTE_FROM_ME,
+         * or the task which answered the call.
+         */
+        task_id_t task_id;
         /** Phone which made or last masqueraded this call. */
         phone_t *phone;