Changes in kernel/generic/src/ipc/ipc.c [c713aa56:e701eb1] in mainline

File:

• kernel/generic/src/ipc/ipc.c (modified) (6 diffs)

kernel/generic/src/ipc/ipc.c

@@ -212 +212 @@
  *
  * @param call          Call structure to be answered.
- * @param selflocked    If true, then TASK->answebox is locked.
- */
-static void _ipc_answer_free_call(call_t *call, bool selflocked)
+ */
+static void _ipc_answer_free_call(call_t *call)
 {
         answerbox_t *callerbox = call->callerbox;
-        bool do_lock = ((!selflocked) || callerbox != (&TASK->answerbox));
 
         call->flags |= IPC_CALL_ANSWERED;
@@ -228 +226 @@
         }
 
-        if (do_lock)
-                spinlock_lock(&callerbox->lock);
+        spinlock_lock(&callerbox->lock);
         list_append(&call->link, &callerbox->answers);
-        if (do_lock)
-                spinlock_unlock(&callerbox->lock);
+        spinlock_unlock(&callerbox->lock);
         waitq_wakeup(&callerbox->wq, WAKEUP_FIRST);
 }
@@ -248 +244 @@
         spinlock_unlock(&box->lock);
         /* Send back answer */
-        _ipc_answer_free_call(call, false);
+        _ipc_answer_free_call(call);
 }
 
@@ -265 +261 @@
         atomic_inc(&phone->active_calls);
         IPC_SET_RETVAL(call->data, err);
-        _ipc_answer_free_call(call, false);
+        _ipc_answer_free_call(call);
 }
 
@@ -304 +300 @@
                 if (call->flags & IPC_CALL_FORWARDED) {
                         IPC_SET_RETVAL(call->data, EFORWARD);
-                        _ipc_answer_free_call(call, false);
+                        _ipc_answer_free_call(call);
                 } else {
                         if (phone->state == IPC_PHONE_HUNGUP)
@@ -459 +455 @@
 
                 IPC_SET_RETVAL(call->data, EHANGUP);
-                _ipc_answer_free_call(call, true);
+                _ipc_answer_free_call(call);
         }
 }