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

Commit 32b93b34 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ANDROID: binder: fix node sched policy calculation"

parents ebe8c607 efdd9934

drivers/android/binder.c

+2 −5
Original line number Diff line number Diff line
@@ -1202,7 +1202,7 @@ static void binder_transaction_priority(struct task_struct *task, 
					struct binder_priority node_prio,

					bool inherit_rt)

{

	struct binder_priority desired_prio;

	struct binder_priority desired_prio = t->priority;



	if (t->set_priority_called)

		return;
@@ -1214,9 +1214,6 @@ static void binder_transaction_priority(struct task_struct *task, 
	if (!inherit_rt && is_rt_policy(desired_prio.sched_policy)) {

		desired_prio.prio = NICE_TO_PRIO(0);

		desired_prio.sched_policy = SCHED_NORMAL;

	} else {

		desired_prio.prio = t->priority.prio;

		desired_prio.sched_policy = t->priority.sched_policy;

	}



	if (node_prio.prio < t->priority.prio ||
@@ -1319,7 +1316,7 @@ static struct binder_node *binder_init_node_ilocked( 
	node->cookie = cookie;

	node->work.type = BINDER_WORK_NODE;

	priority = flags & FLAT_BINDER_FLAG_PRIORITY_MASK;

	node->sched_policy = (flags & FLAT_BINDER_FLAG_PRIORITY_MASK) >>

	node->sched_policy = (flags & FLAT_BINDER_FLAG_SCHED_POLICY_MASK) >>

		FLAT_BINDER_FLAG_SCHED_POLICY_SHIFT;

	node->min_priority = to_kernel_prio(node->sched_policy, priority);

	node->accept_fds = !!(flags & FLAT_BINDER_FLAG_ACCEPTS_FDS);