---

yaml --- r: 69030 b: refs/heads/master c: 28a1f6f h: refs/heads/master v: v3
git-mirror · Oct 15, 2007 · c44589a · c44589a
1 parent 905a926
commit c44589a
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 11 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 67e12eac328b276dca7e61640632ed996ff1a93a
+refs/heads/master: 28a1f6fa2f7ecec7e5da28b03a24abbecbd2e864
diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c
@@ -399,16 +399,14 @@ 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 =
 		SCHED_FEAT_FAIR_SLEEPERS	*0 |
 		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/trunk/kernel/sched_fair.c b/trunk/kernel/sched_fair.c
@@ -1063,13 +1063,6 @@ static void task_new_fair(struct rq *rq, struct task_struct *p)
 	update_curr(cfs_rq);
 	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: