From 60edcd1ab622f0b82291f991ecb947d10dc086d9 Mon Sep 17 00:00:00 2001 From: Peter Zijlstra Date: Mon, 5 May 2008 23:56:17 +0200 Subject: [PATCH] --- yaml --- r: 96033 b: refs/heads/master c: e05510d01ad1565e5e086a939261084d67ba2b10 h: refs/heads/master i: 96031: 8b4dc17a41b75e007c3e47b70fbaa1afcf7dbf88 v: v3 --- [refs] | 2 +- trunk/kernel/sched.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index d069f99ed8d9..dd3d3e28caef 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a992241de614dd2b7c97a9ba64e28c0e563f19bf +refs/heads/master: e05510d01ad1565e5e086a939261084d67ba2b10 diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c index 34bcc5bc120e..00c1ba706a5a 100644 --- a/trunk/kernel/sched.c +++ b/trunk/kernel/sched.c @@ -1438,8 +1438,8 @@ calc_delta_mine(unsigned long delta_exec, unsigned long weight, { u64 tmp; - if (unlikely(!lw->inv_weight)) - lw->inv_weight = (WMULT_CONST-lw->weight/2) / (lw->weight+1); + if (!lw->inv_weight) + lw->inv_weight = 1 + (WMULT_CONST-lw->weight/2)/(lw->weight+1); tmp = (u64)delta_exec * weight; /* @@ -8025,7 +8025,7 @@ static void init_tg_cfs_entry(struct task_group *tg, struct cfs_rq *cfs_rq, se->my_q = cfs_rq; se->load.weight = tg->shares; - se->load.inv_weight = div64_u64(1ULL<<32, se->load.weight); + se->load.inv_weight = 0; se->parent = parent; } #endif @@ -8692,7 +8692,7 @@ static void __set_se_shares(struct sched_entity *se, unsigned long shares) dequeue_entity(cfs_rq, se, 0); se->load.weight = shares; - se->load.inv_weight = div64_u64((1ULL<<32), shares); + se->load.inv_weight = 0; if (on_rq) enqueue_entity(cfs_rq, se, 0);