Revert "ANDROID: sched: Introduce uclamp latency and boost wrapper"
This reverts commit 0e00b6f9dd. 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 <patrick.bellasi@arm.com>
Cc: Quentin Perret <qperret@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I3d04e4aac5bfb1a7e96623af58ed26352640f433
This commit is contained in:
@@ -2912,11 +2912,6 @@ out:
|
|||||||
return clamp(util, min_util, max_util);
|
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'
|
* 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
|
* 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;
|
return util;
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline bool uclamp_boosted(struct task_struct *p)
|
|
||||||
{
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
static inline bool uclamp_is_used(void)
|
static inline bool uclamp_is_used(void)
|
||||||
{
|
{
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
#endif /* CONFIG_UCLAMP_TASK */
|
#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
|
#ifdef arch_scale_freq_capacity
|
||||||
# ifndef arch_scale_freq_invariant
|
# ifndef arch_scale_freq_invariant
|
||||||
# define arch_scale_freq_invariant() true
|
# define arch_scale_freq_invariant() true
|
||||||
|
|||||||
Reference in New Issue
Block a user