---

yaml --- r: 87388 b: refs/heads/master c: 6a6029b h: refs/heads/master v: v3
git-mirror · Mar 15, 2008 · 7301b2c · 7301b2c
1 parent 7b2b986
commit 7301b2c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git 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
@@ -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);
 }
 
 /*