evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "CHROMIUM: android: binder: Fix potential scheduling-while-atomic"

Browse source 
This reverts commit 71b1886054.

Change-Id: I9ded0ff43535c1367c2cf79dfeec20d4b5f0357a
This commit is contained in:
Mark Salyzyn 2016-07-18 22:21:12 +00:00
parent 71b1886054
commit 13c17d0179
1 changed files with 2 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
drivers/android/binder.c
View file

@ -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();
}
}
/*