From a54c38f4d31c4989487986fc7d2b6fdf4db1e8a6 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 31 Mar 2022 19:41:02 +0200 Subject: [PATCH] Revert "ANDROID: sched: Introduce uclamp latency and boost wrapper" This reverts commit 0e00b6f9dd78f16d214959bb4b1af7ec4e62f9e4. It causes merge issues with 5.18-rc1 and has to be reverted for now. If it is still needed, it can be added back after 5.18-rc1. Bug: 120440300 Cc: Patrick Bellasi Cc: Quentin Perret Signed-off-by: Greg Kroah-Hartman Change-Id: I3d04e4aac5bfb1a7e96623af58ed26352640f433 --- kernel/sched/sched.h | 29 ----------------------------- 1 file changed, 29 deletions(-) diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h index 5e67c6900bda..486dee5b5657 100644 --- a/kernel/sched/sched.h +++ b/kernel/sched/sched.h @@ -2912,11 +2912,6 @@ out: return clamp(util, min_util, max_util); } -static inline bool uclamp_boosted(struct task_struct *p) -{ - return uclamp_eff_value(p, UCLAMP_MIN) > 0; -} - /* * When uclamp is compiled in, the aggregation at rq level is 'turned off' * by default in the fast path and only gets turned on once userspace performs @@ -2937,36 +2932,12 @@ unsigned long uclamp_rq_util_with(struct rq *rq, unsigned long util, return util; } -static inline bool uclamp_boosted(struct task_struct *p) -{ - return false; -} - static inline bool uclamp_is_used(void) { return false; } #endif /* CONFIG_UCLAMP_TASK */ -#ifdef CONFIG_UCLAMP_TASK_GROUP -static inline bool uclamp_latency_sensitive(struct task_struct *p) -{ - struct cgroup_subsys_state *css = task_css(p, cpu_cgrp_id); - struct task_group *tg; - - if (!css) - return false; - tg = container_of(css, struct task_group, css); - - return tg->latency_sensitive; -} -#else -static inline bool uclamp_latency_sensitive(struct task_struct *p) -{ - return false; -} -#endif /* CONFIG_UCLAMP_TASK_GROUP */ - #ifdef arch_scale_freq_capacity # ifndef arch_scale_freq_invariant # define arch_scale_freq_invariant() true