Messages in this thread Patch in this message | | | Subject | Re: [PATCH v2 3/4] sched/fair: Make task_fits_capacity() consider uclamp restrictions | From | Dietmar Eggemann <> | Date | Tue, 10 Dec 2019 18:07:06 +0100 |
| |
On 03/12/2019 16:59, Valentin Schneider wrote:
[...]
> diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c > index 08a233e97a01..dc3e86cb2b2e 100644 > --- a/kernel/sched/fair.c > +++ b/kernel/sched/fair.c > @@ -3711,6 +3711,22 @@ static inline unsigned long task_util_est(struct task_struct *p) > return max(task_util(p), _task_util_est(p)); > } > > +#ifdef CONFIG_UCLAMP_TASK > +static inline > +unsigned long uclamp_task_util(struct task_struct *p) > +{ > + return clamp(task_util_est(p), > + (unsigned long)uclamp_eff_value(p, UCLAMP_MIN), > + (unsigned long)uclamp_eff_value(p, UCLAMP_MAX)); > +} > +#else > +static inline > +unsigned long uclamp_task_util(struct task_struct *p)
[...]
Save some lines?
diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index cc659a3944f1..ab921ee356a9 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -3712,16 +3712,14 @@ static inline unsigned long task_util_est(struct task_struct *p) }
#ifdef CONFIG_UCLAMP_TASK -static inline -unsigned long uclamp_task_util(struct task_struct *p) +static inline unsigned long uclamp_task_util(struct task_struct *p) { return clamp(task_util_est(p), (unsigned long)uclamp_eff_value(p, UCLAMP_MIN), (unsigned long)uclamp_eff_value(p, UCLAMP_MAX)); } #else -static inline -unsigned long uclamp_task_util(struct task_struct *p) +static inline unsigned long uclamp_task_util(struct task_struct *p) { return task_util_est(p); } [...]
| |