diff options
author | Ingo Molnar <mingo@elte.hu> | 2010-10-14 09:11:43 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2010-10-14 09:11:46 +0200 |
commit | ed859ed3b0f9893c6bce3708e8928341c15699b9 (patch) | |
tree | 59c507f00bc13becb4accdd64fdc01ece08b4645 /kernel/sched_fair.c | |
parent | a8027073eb127cd207070891374b5c54c2ce3d23 (diff) | |
parent | 53eeb64e808971207350386121f4bab12fa2f45f (diff) | |
download | linux-ed859ed3b0f9893c6bce3708e8928341c15699b9.tar.gz linux-ed859ed3b0f9893c6bce3708e8928341c15699b9.tar.bz2 linux-ed859ed3b0f9893c6bce3708e8928341c15699b9.zip |
Merge branch 'linus' into sched/core
Merge reason: update from -rc5 to -almost-final
Signed-off-by: Ingo Molnar <mingo@elte.hu>
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 aa16cf1eb8fe..623e9aceef8f 100644 --- a/kernel/sched_fair.c +++ b/kernel/sched_fair.c @@ -3637,7 +3637,7 @@ static inline int nohz_kick_needed(struct rq *rq, int cpu) if (time_before(now, nohz.next_balance)) return 0; - if (!rq->nr_running) + if (rq->idle_at_tick) return 0; first_pick_cpu = atomic_read(&nohz.first_pick_cpu); |