Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm

[platform/kernel/linux-starfive.git] / drivers / android / binder.c

diff --git a/drivers/android/binder.c b/drivers/android/binder.c
index 6428f6b..880224e 100644 (file)
--- a/drivers/android/binder.c
+++ b/drivers/android/binder.c
@@ -4259,10 +4259,9 @@ static int binder_wait_for_work(struct binder_thread *thread,
        struct binder_proc *proc = thread->proc;
        int ret = 0;
 
-       freezer_do_not_count();
        binder_inner_proc_lock(proc);
        for (;;) {
-               prepare_to_wait(&thread->wait, &wait, TASK_INTERRUPTIBLE);
+               prepare_to_wait(&thread->wait, &wait, TASK_INTERRUPTIBLE|TASK_FREEZABLE);
                if (binder_has_work_ilocked(thread, do_proc_work))
                        break;
                if (do_proc_work)
@@ -4279,7 +4278,6 @@ static int binder_wait_for_work(struct binder_thread *thread,
        }
        finish_wait(&thread->wait, &wait);
        binder_inner_proc_unlock(proc);
-       freezer_count();
 
        return ret;
 }