---

yaml --- r: 64372 b: refs/heads/master c: a6f2994 h: refs/heads/master v: v3
git-mirror · Aug 24, 2007 · 97e8945 · 97e8945
1 parent 6e86506
commit 97e8945
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b2133c8b1e270b4a7c36f70e29be8738d09e850b
+refs/heads/master: a6f2994042cc2db9e507dc702ed0b5e2cc5890fe
diff --git a/trunk/kernel/sched_fair.c b/trunk/kernel/sched_fair.c
@@ -303,8 +303,7 @@ __update_curr(struct cfs_rq *cfs_rq, struct sched_entity *curr)
 	delta_mine = calc_delta_mine(delta_exec, curr->load.weight, lw);
 
 	if (cfs_rq->sleeper_bonus > sysctl_sched_granularity) {
-		delta = min(cfs_rq->sleeper_bonus, (u64)delta_exec);
-		delta = calc_delta_mine(delta, curr->load.weight, lw);
+		delta = calc_delta_mine(delta_exec, curr->load.weight, lw);
 		delta = min((u64)delta, cfs_rq->sleeper_bonus);
 		delta = min(delta, (unsigned long)(
 			(long)sysctl_sched_runtime_limit - curr->wait_runtime));