From a979f578cc0d54205c814e4db7e0e80f4d6488f2 Mon Sep 17 00:00:00 2001 From: Tao Huang Date: Thu, 14 Dec 2017 15:18:46 +0800 Subject: [PATCH] Revert "ANDROID: binder: clarify deferred thread work." This reverts commit 3f883f9b5cf0d8361f28cabba13c36da68f0ed85. Change-Id: I7b597f826bf975ac2221ee4558c8164408f3fc1b Signed-off-by: Tao Huang --- drivers/android/binder.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/drivers/android/binder.c b/drivers/android/binder.c index 008e448536de..fddb10c27f10 100644 --- a/drivers/android/binder.c +++ b/drivers/android/binder.c @@ -833,7 +833,7 @@ binder_enqueue_work_ilocked(struct binder_work *work, } /** - * binder_enqueue_deferred_thread_work_ilocked() - Add deferred thread work + * binder_enqueue_thread_work_ilocked_nowake() - Add thread work * @thread: thread to queue work to * @work: struct binder_work to add to list * @@ -844,8 +844,8 @@ binder_enqueue_work_ilocked(struct binder_work *work, * Requires the proc->inner_lock to be held. */ static void -binder_enqueue_deferred_thread_work_ilocked(struct binder_thread *thread, - struct binder_work *work) +binder_enqueue_thread_work_ilocked_nowake(struct binder_thread *thread, + struct binder_work *work) { binder_enqueue_work_ilocked(work, &thread->todo); } @@ -3348,14 +3348,7 @@ static void binder_transaction(struct binder_proc *proc, } else if (!(t->flags & TF_ONE_WAY)) { BUG_ON(t->buffer->async_transaction != 0); binder_inner_proc_lock(proc); - /* - * Defer the TRANSACTION_COMPLETE, so we don't return to - * userspace immediately; this allows the target process to - * immediately start processing this transaction, reducing - * latency. We will then return the TRANSACTION_COMPLETE when - * the target replies (or there is an error). - */ - binder_enqueue_deferred_thread_work_ilocked(thread, tcomplete); + binder_enqueue_thread_work_ilocked_nowake(thread, tcomplete); t->need_reply = 1; t->from_parent = thread->transaction_stack; thread->transaction_stack = t;