---

yaml --- r: 191390 b: refs/heads/master c: 5ca9880 h: refs/heads/master v: v3
git-mirror · Mar 11, 2010 · 9f6b297 · 9f6b297
1 parent 7db3d62
commit 9f6b297
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 9 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6bc6cf2b61336ed0c55a615eb4c0c8ed5daf3f08
+refs/heads/master: 5ca9880c6f4ba4c84b517bc2fed5366adf63d191
diff --git a/trunk/kernel/sched_fair.c b/trunk/kernel/sched_fair.c
@@ -738,7 +738,7 @@ place_entity(struct cfs_rq *cfs_rq, struct sched_entity *se, int initial)
 		vruntime += sched_vslice(cfs_rq, se);
 
 	/* sleeps up to a single latency don't count. */
-	if (!initial && sched_feat(FAIR_SLEEPERS)) {
+	if (!initial) {
 		unsigned long thresh = sysctl_sched_latency;
 
 		/*

diff --git a/trunk/kernel/sched_features.h b/trunk/kernel/sched_features.h
@@ -1,10 +1,3 @@
-/*
- * Disregards a certain amount of sleep time (sched_latency_ns) and
- * considers the task to be running during that period. This gives it
- * a service deficit on wakeup, allowing it to run sooner.
- */
-SCHED_FEAT(FAIR_SLEEPERS, 1)
-
 /*
  * Only give sleepers 50% of their service deficit. This allows
  * them to run sooner, but does not allow tons of sleepers to