Changeset 9247c02c in mainline for kernel

Timestamp:

2011-08-19T14:06:21Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

7a2f7ecd

Parents:

2f2f1186 (diff), e2ab36f1 (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 from lp:~jakub/helenos/camp2011.

Location:

kernel/generic

Files:

• include/ipc/ipc.h (modified) (2 diffs)
• src/ipc/event.c (modified) (1 diff)
• src/ipc/ipc.c (modified) (2 diffs)
• src/ipc/sysipc.c (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
@@ -98 +99 @@
         sysarg_t args[IPC_CALL_LEN];
         /** Task which made or forwarded the call with IPC_FF_ROUTE_FROM_ME. */
-        struct task *task;
+        task_id_t task_id;
         /** Phone which made or last masqueraded this call. */
         phone_t *phone;

kernel/generic/src/ipc/event.c

@@ -161 +161 @@
                                 IPC_SET_ARG5(call->data, a5);
                                 
+                                call->data.task_id = TASK ? TASK->taskid : 0;
+                                
                                 irq_spinlock_lock(&event->answerbox->irq_lock, true);
                                 list_append(&call->link, &event->answerbox->irq_notifs);

kernel/generic/src/ipc/ipc.c

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

kernel/generic/src/ipc/sysipc.c

@@ -54 +54 @@
 #include <mm/as.h>
 #include <print.h>
+#include <macros.h>
 
 /**
@@ -375 +376 @@
                                     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);
                         }