From 25756db30430695b9015438c73f0104e4100a1d7 Mon Sep 17 00:00:00 2001 From: Peter Zijlstra Date: Fri, 24 Aug 2007 20:39:10 +0200 Subject: [PATCH] --- yaml --- r: 64373 b: refs/heads/master c: ea0aa3b23a193d1fc5c982286edecd071af67d94 h: refs/heads/master i: 64371: 6e865069b30b666c91c194cb97ba436c406d8e60 v: v3 --- [refs] | 2 +- trunk/kernel/sched_fair.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 4d02ecfaaeb3..c3eba4f31965 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a6f2994042cc2db9e507dc702ed0b5e2cc5890fe +refs/heads/master: ea0aa3b23a193d1fc5c982286edecd071af67d94 diff --git a/trunk/kernel/sched_fair.c b/trunk/kernel/sched_fair.c index 5b2d97fcd80c..c078f1af721c 100644 --- 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 = calc_delta_mine(delta_exec, curr->load.weight, lw); - delta = min((u64)delta, cfs_rq->sleeper_bonus); + delta = min((u64)delta_mine, cfs_rq->sleeper_bonus); delta = min(delta, (unsigned long)( (long)sysctl_sched_runtime_limit - curr->wait_runtime)); cfs_rq->sleeper_bonus -= delta;