sched: cleanup old and rarely used 'debug' features.

TREE_AVG and APPROX_AVG are initial task placement policies that have been
disabled for a long while.. time to remove them.

Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
CC: Srivatsa Vaddagiri <vatsa@linux.vnet.ibm.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 0 insertions, 14 deletions

diff --git a/kernel/sched_fair.c b/kernel/sched_fair.c
index b85cac4b5e25..86a93376282c 100644
--- a/kernel/sched_fair.c
+++ b/kernel/sched_fair.c
@@ -302,11 +302,6 @@ static u64 __sched_vslice(unsigned long rq_weight, unsigned long nr_running)
         return vslice;
 }
 
-static u64 sched_vslice(struct cfs_rq *cfs_rq)
-{
-        return __sched_vslice(cfs_rq->load.weight, cfs_rq->nr_running);
-}
-
 static u64 sched_vslice_add(struct cfs_rq *cfs_rq, struct sched_entity *se)
 {
         return __sched_vslice(cfs_rq->load.weight + se->load.weight,
@@ -504,15 +499,6 @@ place_entity(struct cfs_rq *cfs_rq, struct sched_entity *se, int initial)
         } else
                 vruntime = cfs_rq->min_vruntime;
 
-        if (sched_feat(TREE_AVG)) {
-                struct sched_entity *last = __pick_last_entity(cfs_rq);
-                if (last) {
-                        vruntime += last->vruntime;
-                        vruntime >>= 1;
-                }
-        } else if (sched_feat(APPROX_AVG) && cfs_rq->nr_running)
-                vruntime += sched_vslice(cfs_rq)/2;
-
         /*
          * The 'current' period is already promised to the current tasks,
          * however the extra weight of the new task will slow them down a