From 33f7ae250ca523ab6e039062dbde5ad1decd985b Mon Sep 17 00:00:00 2001 From: Quentin Perret Date: Tue, 15 Dec 2020 17:55:48 +0000 Subject: [PATCH] Revert "ANDROID: sched/fair: update_max_interval() active_mask dependant" This reverts commit 75d6951cf8cb7aec6b7a8cc4f595ca2e11082fd7. CPU Pause causes major merge conflicts with the 5.11 scheduler changes (migrate-disable specifically), so lets revert Pause temporarily as it is not needed urgently in android-mainline. Signed-off-by: Quentin Perret Change-Id: I05b0288ae67b72f9a4151f41fad1546e4f7ba1f7 --- kernel/sched/core.c | 7 ++----- kernel/sched/fair.c | 2 +- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/kernel/sched/core.c b/kernel/sched/core.c index 8551725acaf5..328093b197dd 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -6974,8 +6974,6 @@ int sched_cpu_activate(unsigned int cpu) } rq_unlock_irqrestore(rq, &rf); - update_max_interval(); - return 0; } @@ -7010,9 +7008,6 @@ int sched_cpu_deactivate(unsigned int cpu) return ret; } sched_domains_numa_masks_clear(cpu); - - update_max_interval(); - return 0; } @@ -7021,6 +7016,7 @@ static void sched_rq_cpu_starting(unsigned int cpu) struct rq *rq = cpu_rq(cpu); rq->calc_load_update = calc_load_update; + update_max_interval(); } int sched_cpu_starting(unsigned int cpu) @@ -7052,6 +7048,7 @@ int sched_cpu_dying(unsigned int cpu) trace_android_rvh_sched_cpu_dying(cpu); calc_load_migrate(rq); + update_max_interval(); nohz_balance_exit_idle(rq); hrtick_clear(rq); return 0; diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index b28920c1bf8c..55247a7ee755 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -10033,7 +10033,7 @@ static DEFINE_SPINLOCK(balancing); */ void update_max_interval(void) { - max_load_balance_interval = HZ*num_active_cpus()/10; + max_load_balance_interval = HZ*num_online_cpus()/10; } /*