From e99623b31d0fa7ca46ddeb29809c9d6a73d96476 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 19 Sep 2019 20:49:12 +0200 Subject: [PATCH] Revert "ANDROID: sched: Prevent unnecessary active balance of single task in sched group" This reverts commit 7846cccba0b0375560d49ce5cd7b36dbbe41532e. 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 Signed-off-by: Greg Kroah-Hartman Change-Id: Idb2a1eeb907c2ecbf29c71462594f5966a268a5a --- kernel/sched/fair.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index 3cd16f257e10..d117cf2f797b 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -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 @@ next_group: 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,8 +9024,7 @@ more_balance: * excessive cache_hot migrations and active balances. */ if (idle != CPU_NEWLY_IDLE) - if (env.src_grp_nr_running > 1) - sd->nr_balance_failed++; + sd->nr_balance_failed++; if (need_active_balance(&env)) { unsigned long flags;