diff --git a/kernel/sched/walt/sysctl.c b/kernel/sched/walt/sysctl.c index d55ea70184fc..0f27133c7a6b 100644 --- a/kernel/sched/walt/sysctl.c +++ b/kernel/sched/walt/sysctl.c @@ -57,6 +57,7 @@ unsigned int sysctl_sched_min_task_util_for_boost = 51; unsigned int sysctl_sched_min_task_util_for_colocation = 35; unsigned int sysctl_sched_many_wakeup_threshold = WALT_MANY_WAKEUP_DEFAULT; const int sched_user_hint_max = 1000; +unsigned int sysctl_walt_rtg_cfs_boost_prio = 99; /* disabled by default */ /* range is [1 .. INT_MAX] */ static int sysctl_task_read_pid = 1; @@ -697,15 +698,6 @@ struct ctl_table walt_table[] = { .mode = 0644, .proc_handler = sched_updown_migrate_handler, }, - { - .procname = "sched_prefer_spread", - .data = &sysctl_sched_prefer_spread, - .maxlen = sizeof(unsigned int), - .mode = 0644, - .proc_handler = proc_dointvec_minmax, - .extra1 = SYSCTL_ZERO, - .extra2 = &four, - }, { .procname = "walt_rtg_cfs_boost_prio", .data = &sysctl_walt_rtg_cfs_boost_prio, @@ -842,10 +834,6 @@ void walt_tunables(void) sched_load_granule = DEFAULT_SCHED_RAVG_WINDOW / NUM_LOAD_INDICES; - sysctl_sched_min_task_util_for_boost = 51; - - sysctl_sched_min_task_util_for_colocation = 35; - for (i = 0; i < WALT_NR_CPUS; i++) { sysctl_sched_coloc_busy_hyst_cpu[i] = 39000000; sysctl_sched_coloc_busy_hyst_cpu_busy_pct[i] = 10; @@ -855,8 +843,6 @@ void walt_tunables(void) sysctl_sched_coloc_busy_hyst_max_ms = 5000; - sysctl_walt_rtg_cfs_boost_prio = 99; /* disabled by default */ - sched_ravg_window = DEFAULT_SCHED_RAVG_WINDOW; sysctl_input_boost_ms = 40; diff --git a/kernel/sched/walt/walt.h b/kernel/sched/walt/walt.h index 087abb6d400a..dfb2e8f5826d 100644 --- a/kernel/sched/walt/walt.h +++ b/kernel/sched/walt/walt.h @@ -239,7 +239,6 @@ extern unsigned int sysctl_sched_many_wakeup_threshold; extern unsigned int sysctl_walt_rtg_cfs_boost_prio; extern __read_mostly unsigned int sysctl_sched_force_lb_enable; extern const int sched_user_hint_max; -extern unsigned int sysctl_sched_prefer_spread; #define for_each_sched_cluster(cluster) \ list_for_each_entry_rcu(cluster, &cluster_head, list) diff --git a/kernel/sched/walt/walt_cfs.c b/kernel/sched/walt/walt_cfs.c index 940c3f99e784..78c45a3aa058 100644 --- a/kernel/sched/walt/walt_cfs.c +++ b/kernel/sched/walt/walt_cfs.c @@ -18,27 +18,8 @@ unsigned int sched_capacity_margin_down[WALT_NR_CPUS] = { [0 ... WALT_NR_CPUS-1] = 1205 /* ~15% margin */ }; -__read_mostly unsigned int sysctl_sched_prefer_spread; -unsigned int sysctl_walt_rtg_cfs_boost_prio = 99; /* disabled by default */ -unsigned int sched_small_task_threshold = 102; __read_mostly unsigned int sysctl_sched_force_lb_enable = 1; -static inline bool prefer_spread_on_idle(int cpu, bool new_ilb) -{ - switch (sysctl_sched_prefer_spread) { - case 1: - return is_min_capacity_cpu(cpu); - case 2: - return true; - case 3: - return (new_ilb && is_min_capacity_cpu(cpu)); - case 4: - return new_ilb; - default: - return false; - } -} - static inline bool bias_to_this_cpu(struct task_struct *p, int cpu, int start_cpu) {