Index: kernel/generic/src/ipc/ipc.c
===================================================================
--- kernel/generic/src/ipc/ipc.c	(revision 6c441cf8f35799043d891a3a77032e1b0e49112b)
+++ kernel/generic/src/ipc/ipc.c	(revision 79dbc3efc94984b1077fba8b530bcf8b5e5e6ac4)
@@ -118,6 +118,7 @@
  *
  * @param box		Answerbox structure to be initialized.
- */
-void ipc_answerbox_init(answerbox_t *box)
+ * @param task		Task to which the answerbox belongs.
+ */
+void ipc_answerbox_init(answerbox_t *box, task_t *task)
 {
 	spinlock_initialize(&box->lock, "ipc_box_lock");
@@ -130,5 +131,5 @@
 	list_initialize(&box->irq_notifs);
 	list_initialize(&box->irq_head);
-	box->task = TASK;
+	box->task = task;
 }
 
@@ -173,5 +174,5 @@
 	answerbox_t sync_box; 
 
-	ipc_answerbox_init(&sync_box);
+	ipc_answerbox_init(&sync_box, TASK);
 
 	/* We will receive data in a special box. */