Revert "sched: fair/ems: Add schedtune_util_est"

This reverts commit 0084cce86c169f068fe02aac9cbab499feb1c6a4.

diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
index 529af4b13ffcdb7d3ac9dc08142231b93d6f555f..30996c0860dbc49493524579fcd2b93b690a2860 100644 (file)
--- a/kernel/sched/fair.c
+++ b/kernel/sched/fair.c
@@ -3713,12 +3713,11 @@ static inline unsigned long task_util(struct task_struct *p)
        return READ_ONCE(p->se.avg.util_avg);
 }
 
-inline unsigned long _task_util_est(struct task_struct *p)
+static inline unsigned long _task_util_est(struct task_struct *p)
 {
        struct util_est ue = READ_ONCE(p->se.avg.util_est);
 
-       return schedtune_util_est_en(p) ? max(ue.ewma, ue.enqueued)
-                                       : task_util(p);
+       return max(ue.ewma, ue.enqueued);
 }
 
 unsigned long task_util_est(struct task_struct *p)