BACKPORT: sched/uclamp: Remove uclamp_util()

The sole user of uclamp_util(), schedutil_cpu_util(), was made to use
uclamp_util_with() instead in commit:

  af24bde8df ("sched/uclamp: Add uclamp support to energy_compute()")

From then on, uclamp_util() has remained unused. Being a simple wrapper
around uclamp_util_with(), we can get rid of it and win back a few lines.

[QP: fixed trivial cherry-pick conflict caused by uclamp_boosted()]

Bug: 120440300
Tested-By: Dietmar Eggemann <[email protected]>
Suggested-by: Dietmar Eggemann <[email protected]>
Signed-off-by: Valentin Schneider <[email protected]>
Signed-off-by: Peter Zijlstra (Intel) <[email protected]>
Reviewed-by: Dietmar Eggemann <[email protected]>
Cc: Linus Torvalds <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Cc: Thomas Gleixner <[email protected]>
Link: https://lkml.kernel.org/r/[email protected]
Signed-off-by: Ingo Molnar <[email protected]>
(cherry picked from commit 59fe675248ffc37d4167e9ec6920a2f3d5ec67bb)
Signed-off-by: Quentin Perret <[email protected]>
Change-Id: I85c97644dbb3172cb9a661c5f0b9af43dfe9c87f
This commit is contained in:
Valentin Schneider 2019-12-11 11:38:47 +00:00 • committed by Quentin Perret
commit 6966eb9ecf

View file

@ -2353,11 +2353,6 @@ unsigned int uclamp_util_with(struct rq *rq, unsigned int util,
return clamp(util, min_util, max_util);
}
static inline unsigned int uclamp_util(struct rq *rq, unsigned int util)
{
return uclamp_util_with(rq, util, NULL);
}
static inline bool uclamp_boosted(struct task_struct *p)
{
return uclamp_eff_value(p, UCLAMP_MIN) > 0;
@ -2368,10 +2363,6 @@ static inline unsigned int uclamp_util_with(struct rq *rq, unsigned int util,
{
return util;
}
static inline unsigned int uclamp_util(struct rq *rq, unsigned int util)
{
return util;
}
static inline bool uclamp_boosted(struct task_struct *p)
{
return false;