From c44589a019077f9ab365b7baffba8e08616ca808 Mon Sep 17 00:00:00 2001
From: Ingo Molnar <mingo@elte.hu>
Date: Mon, 15 Oct 2007 17:00:05 +0200
Subject: [PATCH] --- yaml --- r: 69030 b: refs/heads/master c:
 28a1f6fa2f7ecec7e5da28b03a24abbecbd2e864 h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/kernel/sched.c      | 4 +---
 trunk/kernel/sched_fair.c | 7 -------
 3 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index 1ad5593e6d49..ec4d00cca9a5 100644
--- 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
index 5594e65166fc..bf85b4b281c5 100644
--- a/trunk/kernel/sched.c
+++ b/trunk/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/trunk/kernel/sched_fair.c b/trunk/kernel/sched_fair.c
index cc447fbff51c..c8c6b0561391 100644
--- 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: