diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-20 10:51:44 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-20 10:51:44 -0700 |
| commit | 38df92b8cee936334f686c06df0e5fbb92e252df (patch) | |
| tree | ffdfd4e5e746300f38a1267b207b293710b3c9a9 | |
| parent | c4c5ab3089c8a794eb0bdaa9794d0f055dd82412 (diff) | |
| parent | f2e21c9610991e95621a81407cdbab881226419b (diff) | |
| download | linux-38df92b8cee936334f686c06df0e5fbb92e252df.tar.gz linux-38df92b8cee936334f686c06df0e5fbb92e252df.tar.bz2 linux-38df92b8cee936334f686c06df0e5fbb92e252df.zip | |
Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
NOHZ: Properly feed cpufreq ondemand governor
| -rw-r--r-- | kernel/time/tick-sched.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/kernel/time/tick-sched.c b/kernel/time/tick-sched.c index 2aff39c6f10c..e0f59a21c061 100644 --- a/kernel/time/tick-sched.c +++ b/kernel/time/tick-sched.c @@ -222,6 +222,15 @@ void tick_nohz_stop_sched_tick(int inidle) cpu = smp_processor_id(); ts = &per_cpu(tick_cpu_sched, cpu); + + /* + * Call to tick_nohz_start_idle stops the last_update_time from being + * updated. Thus, it must not be called in the event we are called from + * irq_exit() with the prior state different than idle. + */ + if (!inidle && !ts->inidle) + goto end; + now = tick_nohz_start_idle(ts); /* @@ -239,9 +248,6 @@ void tick_nohz_stop_sched_tick(int inidle) if (unlikely(ts->nohz_mode == NOHZ_MODE_INACTIVE)) goto end; - if (!inidle && !ts->inidle) - goto end; - ts->inidle = 1; if (need_resched()) |