diff options
| author | Riley Andrews <riandrews@google.com> | 2015-09-01 20:31:12 -0700 |
|---|---|---|
| committer | Jeevan Shriram <jshriram@codeaurora.org> | 2016-05-10 13:20:20 -0700 |
| commit | e3ba00c712e2f5ca35fd26aac66f595fdb7493f0 (patch) | |
| tree | 2cf3b5a73d9f0866bbd6866795a0f58c7c899062 /drivers | |
| parent | 3956eabb34de6b24bdbe90013c7567867bb139ea (diff) | |
android: binder: Don't use sched_preempt_enable_no_resched.
The correct function is prempt_enable_no_resched(). The other
function is reserved for the scheduler core.
Change-Id: Ib36697de003f6a59a608a0024d5351dc15ff8715
Signed-off-by: Todd Kjos <tkjos@google.com>
Git-commit: 776e5bca6446b3aac03b4685b4f4f72446ddcba0
Git-repo: https://android.googlesource.com/kernel/msm
[odhyade@codeaurora.org: resolve trivial merge conflicts]
Signed-off-by: Omprakash Dhyade <odhyade@codeaurora.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/android/binder.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/android/binder.c b/drivers/android/binder.c index 93b410aeaaf7..6ccf8099c80b 100644 --- a/drivers/android/binder.c +++ b/drivers/android/binder.c @@ -1714,7 +1714,7 @@ static void binder_transaction(struct binder_proc *proc, if (reply || !(t->flags & TF_ONE_WAY)) { preempt_disable(); wake_up_interruptible_sync(target_wait); - sched_preempt_enable_no_resched(); + preempt_enable_no_resched(); } else { wake_up_interruptible(target_wait); |