From 7301b2c0edede5c2329b348dce73a2007238e824 Mon Sep 17 00:00:00 2001 From: Ingo Molnar Date: Fri, 14 Mar 2008 22:17:08 +0100 Subject: [PATCH] --- yaml --- r: 87388 b: refs/heads/master c: 6a6029b8cefe0ca7e82f27f3904dbedba3de4e06 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/kernel/sched_fair.c | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 8267aaf09ebe..1091e9b5ef59 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e22ecef1d2658ba54ed7d3fdb5d60829fb434c23 +refs/heads/master: 6a6029b8cefe0ca7e82f27f3904dbedba3de4e06 diff --git a/trunk/kernel/sched_fair.c b/trunk/kernel/sched_fair.c index 31aa1b9fa762..f2cc59080efa 100644 --- a/trunk/kernel/sched_fair.c +++ b/trunk/kernel/sched_fair.c @@ -283,12 +283,8 @@ static u64 __sched_period(unsigned long nr_running) */ static u64 sched_slice(struct cfs_rq *cfs_rq, struct sched_entity *se) { - u64 slice = __sched_period(cfs_rq->nr_running); - - slice *= se->load.weight; - do_div(slice, cfs_rq->load.weight); - - return slice; + return calc_delta_mine(__sched_period(cfs_rq->nr_running), + se->load.weight, &cfs_rq->load); } /*