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

Commit e99623b3 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman Committed by Alistair Delva
Browse files

Revert "ANDROID: sched: Prevent unnecessary active balance of single task in sched group" 



This reverts commit 7846cccb.

We want to back-out the eas-dev merge that happened in the tree after
5.3-rc1 as those patches "should" all be in Linus's tree now.

This is done to handle the merge conflicts with 5.4-rc1.

Cc: Todd Kjos <tkjos@google.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: Idb2a1eeb907c2ecbf29c71462594f5966a268a5a
parent 9212f0e4

kernel/sched/fair.c

+1 −5
Original line number Diff line number Diff line
@@ -7146,7 +7146,6 @@ struct lb_env { 
	int			new_dst_cpu;

	enum cpu_idle_type	idle;

	long			imbalance;

	unsigned int		src_grp_nr_running;

	/* The set of CPUs under consideration for load-balancing */

	struct cpumask		*cpus;
@@ -8331,8 +8330,6 @@ static inline void update_sd_lb_stats(struct lb_env *env, struct sd_lb_stats *sd 
	if (env->sd->flags & SD_NUMA)

		env->fbq_type = fbq_classify_group(&sds->busiest_stat);



	env->src_grp_nr_running = sds->busiest_stat.sum_nr_running;



	if (!env->sd->parent) {

		struct root_domain *rd = env->dst_rq->rd;
@@ -9027,7 +9024,6 @@ static int load_balance(int this_cpu, struct rq *this_rq, 
		 * excessive cache_hot migrations and active balances.

		 */

		if (idle != CPU_NEWLY_IDLE)

			if (env.src_grp_nr_running > 1)

			sd->nr_balance_failed++;



		if (need_active_balance(&env)) {