diff options
| author | Ingo Molnar <mingo@elte.hu> | 2007-10-15 11:00:13 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2007-10-15 11:00:13 -0400 |
| commit | 06877c33fe9261ccdf143492c28de93c56493079 (patch) | |
| tree | e7781b8029068751251c956d891a4b73ef0d6979 | |
| parent | a65914b3658043da27c159b8a28c5811bb0a88c9 (diff) | |
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>
| -rw-r--r-- | kernel/sched.c | 4 | ||||
| -rw-r--r-- | kernel/sched_fair.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/kernel/sched.c b/kernel/sched.c index 23da93360b22..5bfe1df73f0f 100644 --- a/kernel/sched.c +++ b/kernel/sched.c | |||
| @@ -440,14 +440,14 @@ static void update_rq_clock(struct rq *rq) | |||
| 440 | enum { | 440 | enum { |
| 441 | SCHED_FEAT_NEW_FAIR_SLEEPERS = 1, | 441 | SCHED_FEAT_NEW_FAIR_SLEEPERS = 1, |
| 442 | SCHED_FEAT_START_DEBIT = 2, | 442 | SCHED_FEAT_START_DEBIT = 2, |
| 443 | SCHED_FEAT_USE_TREE_AVG = 4, | 443 | SCHED_FEAT_TREE_AVG = 4, |
| 444 | SCHED_FEAT_APPROX_AVG = 8, | 444 | SCHED_FEAT_APPROX_AVG = 8, |
| 445 | }; | 445 | }; |
| 446 | 446 | ||
| 447 | const_debug unsigned int sysctl_sched_features = | 447 | const_debug unsigned int sysctl_sched_features = |
| 448 | SCHED_FEAT_NEW_FAIR_SLEEPERS *1 | | 448 | SCHED_FEAT_NEW_FAIR_SLEEPERS *1 | |
| 449 | SCHED_FEAT_START_DEBIT *1 | | 449 | SCHED_FEAT_START_DEBIT *1 | |
| 450 | SCHED_FEAT_USE_TREE_AVG *0 | | 450 | SCHED_FEAT_TREE_AVG *0 | |
| 451 | SCHED_FEAT_APPROX_AVG *0; | 451 | SCHED_FEAT_APPROX_AVG *0; |
| 452 | 452 | ||
| 453 | #define sched_feat(x) (sysctl_sched_features & SCHED_FEAT_##x) | 453 | #define sched_feat(x) (sysctl_sched_features & SCHED_FEAT_##x) |
diff --git a/kernel/sched_fair.c b/kernel/sched_fair.c index 7826e18151a8..14a9b9b997ce 100644 --- 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) | |||
| 477 | 477 | ||
| 478 | vruntime = cfs_rq->min_vruntime; | 478 | vruntime = cfs_rq->min_vruntime; |
| 479 | 479 | ||
| 480 | if (sched_feat(USE_TREE_AVG)) { | 480 | if (sched_feat(TREE_AVG)) { |
| 481 | struct sched_entity *last = __pick_last_entity(cfs_rq); | 481 | struct sched_entity *last = __pick_last_entity(cfs_rq); |
| 482 | if (last) { | 482 | if (last) { |
| 483 | vruntime += last->vruntime; | 483 | vruntime += last->vruntime; |
