diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-09-21 16:22:10 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-09-21 16:22:10 -0400 |
| commit | 1ce1e41c1b61a992077bd1c45c6c3fd6a8b10c02 (patch) | |
| tree | 33d958f957e77c93612b027deb91f2e81b08d372 /kernel/sched_fair.c | |
| parent | 87ac6fa26e0e7ea49e1c8030e962effc05e1c5eb (diff) | |
| parent | f6c3f1686e7ec1dd8725a9a3dcb857dfd0c7a5bf (diff) | |
Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
sched: Fix nohz balance kick
sched: Fix user time incorrectly accounted as system time on 32-bit
Diffstat (limited to 'kernel/sched_fair.c')
| -rw-r--r-- | kernel/sched_fair.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/sched_fair.c b/kernel/sched_fair.c index a171138a9402..db3f674ca49d 100644 --- a/kernel/sched_fair.c +++ b/kernel/sched_fair.c | |||
| @@ -3630,7 +3630,7 @@ static inline int nohz_kick_needed(struct rq *rq, int cpu) | |||
| 3630 | if (time_before(now, nohz.next_balance)) | 3630 | if (time_before(now, nohz.next_balance)) |
| 3631 | return 0; | 3631 | return 0; |
| 3632 | 3632 | ||
| 3633 | if (!rq->nr_running) | 3633 | if (rq->idle_at_tick) |
| 3634 | return 0; | 3634 | return 0; |
| 3635 | 3635 | ||
| 3636 | first_pick_cpu = atomic_read(&nohz.first_pick_cpu); | 3636 | first_pick_cpu = atomic_read(&nohz.first_pick_cpu); |