sched: cleanup: rename SCHED_FEAT_USE_TREE_AVG to SCHED_FEAT_TREE_AVG

cleanup: rename SCHED_FEAT_USE_TREE_AVG to SCHED_FEAT_TREE_AVG, to
make SCHED_FEAT_ names more consistent.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

diff --git a/kernel/sched.c b/kernel/sched.c
index 23da93360b221ba02c8d0b0fe16cf0d0e2aafff9..5bfe1df73f0f8795c9c5e6d7f2f1cef3509d037f 100644 (file)
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -440,14 +440,14 @@ static void update_rq_clock(struct rq *rq)
 enum {
        SCHED_FEAT_NEW_FAIR_SLEEPERS    = 1,
        SCHED_FEAT_START_DEBIT          = 2,
-       SCHED_FEAT_USE_TREE_AVG         = 4,
+       SCHED_FEAT_TREE_AVG             = 4,
        SCHED_FEAT_APPROX_AVG           = 8,
 };
 
 const_debug unsigned int sysctl_sched_features =
                SCHED_FEAT_NEW_FAIR_SLEEPERS    *1 |
                SCHED_FEAT_START_DEBIT          *1 |
-               SCHED_FEAT_USE_TREE_AVG         *0 |
+               SCHED_FEAT_TREE_AVG             *0 |
                SCHED_FEAT_APPROX_AVG           *0;
 
 #define sched_feat(x) (sysctl_sched_features & SCHED_FEAT_##x)

diff --git a/kernel/sched_fair.c b/kernel/sched_fair.c
index 7826e18151a8734626005e368fc2a7b047886732..14a9b9b997ce706f963f69325c1b16232ef9a5ef 100644 (file)
--- a/kernel/sched_fair.c
+++ b/kernel/sched_fair.c
@@ -477,7 +477,7 @@ place_entity(struct cfs_rq *cfs_rq, struct sched_entity *se, int initial)
 
        vruntime = cfs_rq->min_vruntime;
 
-       if (sched_feat(USE_TREE_AVG)) {
+       if (sched_feat(TREE_AVG)) {
                struct sched_entity *last = __pick_last_entity(cfs_rq);
                if (last) {
                        vruntime += last->vruntime;