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

Timestamp:

2011-08-21T13:07:35Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

00aece0, f1a9e87

Parents:

86a34d3e (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) (4 diffs)

kernel/generic/src/ipc/ipc.c

@@ -38 +38 @@
  */
 
-#include <synch/synch.h>
 #include <synch/spinlock.h>
 #include <synch/mutex.h>
 #include <synch/waitq.h>
-#include <synch/synch.h>
 #include <ipc/ipc.h>
-#include <ipc/ipc_methods.h>
+#include <abi/ipc/methods.h>
 #include <ipc/kbox.h>
 #include <ipc/event.h>
@@ -232 +230 @@
                 }
         }
+
+        call->data.task_id = TASK->taskid;
         
         if (do_lock)
@@ -296 +296 @@
                 atomic_inc(&phone->active_calls);
                 call->data.phone = phone;
-                call->data.task = TASK;
+                call->data.task_id = TASK->taskid;
         }
         
@@ -408 +408 @@
                         call->caller_phone = call->data.phone;
                 call->data.phone = newphone;
-                call->data.task = TASK;
+                call->data.task_id = TASK->taskid;
         }