瀏覽代碼

revert "sched: fix fair sleepers"

revert "sched: fix fair sleepers" (e22ecef1d2658ba54ed7d3fdb5d60829fb434c23),
because it is causing audio skipping, see:

   http://bugzilla.kernel.org/show_bug.cgi?id=10428

the patch is correct and the real cause of the skipping is not
understood (tracing makes it go away), but time has run out so we'll
revert it and re-try in 2.6.26.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
Ingo Molnar 17 年之前
父節點
當前提交
e2df9e0905
共有 1 個文件被更改,包括 2 次插入4 次删除
  1. 2 4
      kernel/sched_fair.c

+ 2 - 4
kernel/sched_fair.c

@@ -510,10 +510,8 @@ place_entity(struct cfs_rq *cfs_rq, struct sched_entity *se, int initial)
 
 
 	if (!initial) {
 	if (!initial) {
 		/* sleeps upto a single latency don't count. */
 		/* sleeps upto a single latency don't count. */
-		if (sched_feat(NEW_FAIR_SLEEPERS)) {
-			vruntime -= calc_delta_fair(sysctl_sched_latency,
-						    &cfs_rq->load);
-		}
+		if (sched_feat(NEW_FAIR_SLEEPERS))
+			vruntime -= sysctl_sched_latency;
 
 
 		/* ensure we never gain time by being placed backwards. */
 		/* ensure we never gain time by being placed backwards. */
 		vruntime = max_vruntime(se->vruntime, vruntime);
 		vruntime = max_vruntime(se->vruntime, vruntime);