diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-25 11:11:31 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-25 11:11:31 -0800 |
| commit | f6d13daaddeb6e63b15a93bf36a80173bafd29bf (patch) | |
| tree | fbdd45b284d537865036e8e8d740d849be0bbfc3 /kernel/sched/fair.c | |
| parent | d4a63a83933bcd1ef4f3ff6e8637e187dea25632 (diff) | |
| parent | 5e3c1afd4587e70c201bf7224b51f747c9a3dfa8 (diff) | |
| download | op-kernel-dev-f6d13daaddeb6e63b15a93bf36a80173bafd29bf.zip op-kernel-dev-f6d13daaddeb6e63b15a93bf36a80173bafd29bf.tar.gz | |
Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull scheduler fixes from Ingo Molnar:
"A couple of regression fixes mostly hitting virtualized setups, but
also some bare metal systems"
* 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
sched/x86/tsc: Initialize multiplier to 0
sched/clock: Fixup early initialization
sched/preempt/x86: Fix voluntary preempt for x86
Revert "sched: Fix sleep time double accounting in enqueue entity"
Diffstat (limited to 'kernel/sched/fair.c')
| -rw-r--r-- | kernel/sched/fair.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index 867b0a4..966cc2b 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -2360,13 +2360,7 @@ static inline void enqueue_entity_load_avg(struct cfs_rq *cfs_rq, } wakeup = 0; } else { - /* - * Task re-woke on same cpu (or else migrate_task_rq_fair() - * would have made count negative); we must be careful to avoid - * double-accounting blocked time after synchronizing decays. - */ - se->avg.last_runnable_update += __synchronize_entity_decay(se) - << 20; + __synchronize_entity_decay(se); } /* migrated tasks did not contribute to our blocked load */ |
