diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-09-06 15:31:03 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-09-06 15:31:03 +0200 |
| commit | 77dd3b3bd23111040c504be6bd873a5ad09f02df (patch) | |
| tree | 119ddcdf89d6a593a8fefea530249084559eeb44 /kernel/time | |
| parent | ntp: fix ADJ_OFFSET_SS_READ bug and do_adjtimex() cleanup (diff) | |
| parent | drivers/mmc/card/block.c: fix refcount leak in mmc_block_open() (diff) | |
| download | linux-77dd3b3bd23111040c504be6bd873a5ad09f02df.tar.xz linux-77dd3b3bd23111040c504be6bd873a5ad09f02df.zip | |
Merge branch 'linus' into timers/ntp
Diffstat (limited to 'kernel/time')
| -rw-r--r-- | kernel/time/tick-sched.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/kernel/time/tick-sched.c b/kernel/time/tick-sched.c index f5da526424a9..a87b0468568b 100644 --- a/kernel/time/tick-sched.c +++ b/kernel/time/tick-sched.c @@ -162,6 +162,8 @@ void tick_nohz_stop_idle(int cpu) ts->idle_lastupdate = now; ts->idle_sleeptime = ktime_add(ts->idle_sleeptime, delta); ts->idle_active = 0; + + sched_clock_idle_wakeup_event(0); } } @@ -177,6 +179,7 @@ static ktime_t tick_nohz_start_idle(struct tick_sched *ts) } ts->idle_entrytime = now; ts->idle_active = 1; + sched_clock_idle_sleep_event(); return now; } @@ -643,17 +646,21 @@ void tick_setup_sched_timer(void) ts->nohz_mode = NOHZ_MODE_HIGHRES; #endif } +#endif /* HIGH_RES_TIMERS */ +#if defined CONFIG_NO_HZ || defined CONFIG_HIGH_RES_TIMERS void tick_cancel_sched_timer(int cpu) { struct tick_sched *ts = &per_cpu(tick_cpu_sched, cpu); +# ifdef CONFIG_HIGH_RES_TIMERS if (ts->sched_timer.base) hrtimer_cancel(&ts->sched_timer); +# endif ts->nohz_mode = NOHZ_MODE_INACTIVE; } -#endif /* HIGH_RES_TIMERS */ +#endif /** * Async notification about clocksource changes |