diff --git a/[refs] b/[refs] index 6f91e40cc65c..ecfcfe2e94cc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 19ccd97a03a026c2341b35af3ed2078a83c4a22b +refs/heads/master: 1091985b482fdd577a5c511059b9d7b4467bd15d diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c index 3209e2cc2c2e..992a1fae72a7 100644 --- a/trunk/kernel/sched.c +++ b/trunk/kernel/sched.c @@ -697,16 +697,17 @@ calc_delta_fair(unsigned long delta_exec, struct load_weight *lw) return calc_delta_mine(delta_exec, NICE_0_LOAD, lw); } -static void update_load_add(struct load_weight *lw, unsigned long inc) +static inline void update_load_add(struct load_weight *lw, unsigned long inc) { lw->weight += inc; - lw->inv_weight = 0; + lw->inv_weight = WMULT_CONST / lw->weight; } -static void update_load_sub(struct load_weight *lw, unsigned long dec) +static inline void update_load_sub(struct load_weight *lw, unsigned long dec) { lw->weight -= dec; - lw->inv_weight = 0; + if (likely(lw->weight)) + lw->inv_weight = WMULT_CONST / lw->weight; } /*