diff options
| author | Mark Salyzyn <salyzyn@google.com> | 2016-07-18 22:21:12 +0000 |
|---|---|---|
| committer | Mark Salyzyn <salyzyn@google.com> | 2016-07-18 22:21:12 +0000 |
| commit | 13c17d0179f9a055062f37e91a6f6cf00a249ebd (patch) | |
| tree | cdd47a0b27b2abc9294b4d81a7b78b58b7f73ad0 | |
| parent | 71b1886054473597c46a8a25c95477b5262971b5 (diff) | |
Revert "CHROMIUM: android: binder: Fix potential scheduling-while-atomic"
This reverts commit 71b1886054473597c46a8a25c95477b5262971b5.
Change-Id: I9ded0ff43535c1367c2cf79dfeec20d4b5f0357a
| -rw-r--r-- | drivers/android/binder.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/drivers/android/binder.c b/drivers/android/binder.c index b66fe6545f32..f0ce9959d14d 100644 --- a/drivers/android/binder.c +++ b/drivers/android/binder.c @@ -379,7 +379,6 @@ static int task_get_unused_fd_flags(struct binder_proc *proc, int flags) struct files_struct *files = proc->files; unsigned long rlim_cur; unsigned long irqs; - int ret; if (files == NULL) return -ESRCH; @@ -390,11 +389,7 @@ static int task_get_unused_fd_flags(struct binder_proc *proc, int flags) rlim_cur = task_rlimit(proc->tsk, RLIMIT_NOFILE); unlock_task_sighand(proc->tsk, &irqs); - preempt_enable_no_resched(); - ret = __alloc_fd(files, 0, rlim_cur, flags); - preempt_disable(); - - return ret; + return __alloc_fd(files, 0, rlim_cur, flags); } /* @@ -403,11 +398,8 @@ static int task_get_unused_fd_flags(struct binder_proc *proc, int flags) static void task_fd_install( struct binder_proc *proc, unsigned int fd, struct file *file) { - if (proc->files) { - preempt_enable_no_resched(); + if (proc->files) __fd_install(proc->files, fd, file); - preempt_disable(); - } } /* |