Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 84b60019 authored by Todd Kjos's avatar Todd Kjos
Browse files

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

This reverts commit 6a3b9c49.

Sigh. Confusion reigns. The rest of the preempt_disable patch is not in common, so this shouldn't be here afterall (it is in several downstream branches that therefore need this one too).

Re-reverting. We don't want the preempt_disable stuff in common since fine-grained locking is coming soon.

Change-Id: I2595516cab28041fa72f4a38692266a0f2a01ab4
parent 2295052f

drivers/android/binder.c

+2 −10
Original line number Diff line number Diff line
@@ -417,7 +417,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;
@@ -428,11 +427,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);

}



/*
@@ -441,11 +436,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();

	}

}



/*