diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-22 08:36:20 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-22 08:36:20 -0700 |
| commit | 3ffc3f947de2b64f35f6bc4361e83a2bb9e12c71 (patch) | |
| tree | baeb4315fce24573d2df22748db7ac89587d0d3a /kernel | |
| parent | 358c323c17ac527b82c6333db6a485112c21ab0d (diff) | |
| parent | 3c4fbe5e01d7e5309be5045e7ae0db20a049e6dc (diff) | |
| download | op-kernel-dev-3ffc3f947de2b64f35f6bc4361e83a2bb9e12c71.zip op-kernel-dev-3ffc3f947de2b64f35f6bc4361e83a2bb9e12c71.tar.gz | |
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: fix wrong event handler after online an offlined cpu
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/time/tick-sched.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/kernel/time/tick-sched.c b/kernel/time/tick-sched.c index f5da526..7a46bde 100644 --- a/kernel/time/tick-sched.c +++ b/kernel/time/tick-sched.c @@ -643,17 +643,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 |
