diff options
| author | Peter Zijlstra <a.p.zijlstra@chello.nl> | 2010-03-26 12:22:14 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-09-20 13:18:09 -0700 |
| commit | bea226b8e646ddb0bd262fc666b741134b9e9612 (patch) | |
| tree | 60425e1cb0092d62560e6a34c3aab3eed7f15306 /kernel/sched.c | |
| parent | 6975fc131cbca470ddabd070c911a94aaad75ea3 (diff) | |
sched: Fix nr_uninterruptible count
commit cc87f76a601d2d256118f7bab15e35254356ae21 upstream
The cpuload calculation in calc_load_account_active() assumes
rq->nr_uninterruptible will not change on an offline cpu after
migrate_nr_uninterruptible(). However the recent migrate on wakeup
changes broke that and would result in decrementing the offline cpu's
rq->nr_uninterruptible.
Fix this by accounting the nr_uninterruptible on the waking cpu.
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
LKML-Reference: <new-submission>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Mike Galbraith <efault@gmx.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'kernel/sched.c')
| -rw-r--r-- | kernel/sched.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/kernel/sched.c b/kernel/sched.c index 0a2df531b90d..7aed676da071 100644 --- a/kernel/sched.c +++ b/kernel/sched.c @@ -2435,8 +2435,12 @@ static int try_to_wake_up(struct task_struct *p, unsigned int state, * * First fix up the nr_uninterruptible count: */ - if (task_contributes_to_load(p)) - rq->nr_uninterruptible--; + if (task_contributes_to_load(p)) { + if (likely(cpu_online(orig_cpu))) + rq->nr_uninterruptible--; + else + this_rq()->nr_uninterruptible--; + } p->state = TASK_WAKING; if (p->sched_class->task_waking) |