diff options
| -rw-r--r-- | kernel/sched.c | 4 | ||||
| -rw-r--r-- | kernel/sched_fair.c | 7 |
2 files changed, 1 insertions, 10 deletions
diff --git a/kernel/sched.c b/kernel/sched.c index 5594e65166f..bf85b4b281c 100644 --- a/kernel/sched.c +++ b/kernel/sched.c @@ -399,7 +399,6 @@ enum { SCHED_FEAT_SLEEPER_AVG = 4, SCHED_FEAT_SLEEPER_LOAD_AVG = 8, SCHED_FEAT_START_DEBIT = 16, - SCHED_FEAT_SKIP_INITIAL = 32, }; const_debug unsigned int sysctl_sched_features = @@ -407,8 +406,7 @@ const_debug unsigned int sysctl_sched_features = SCHED_FEAT_NEW_FAIR_SLEEPERS *1 | SCHED_FEAT_SLEEPER_AVG *0 | SCHED_FEAT_SLEEPER_LOAD_AVG *1 | - SCHED_FEAT_START_DEBIT *1 | - SCHED_FEAT_SKIP_INITIAL *0; + SCHED_FEAT_START_DEBIT *1; #define sched_feat(x) (sysctl_sched_features & SCHED_FEAT_##x) diff --git a/kernel/sched_fair.c b/kernel/sched_fair.c index cc447fbff51..c8c6b056139 100644 --- a/kernel/sched_fair.c +++ b/kernel/sched_fair.c @@ -1064,13 +1064,6 @@ static void task_new_fair(struct rq *rq, struct task_struct *p) place_entity(cfs_rq, se, 1); /* - * The first wait is dominated by the child-runs-first logic, - * so do not credit it with that waiting time yet: - */ - if (sched_feat(SKIP_INITIAL)) - se->wait_start_fair = 0; - - /* * The statistical average of wait_runtime is about * -granularity/2, so initialize the task with that: */ |