diff options
| author |   Ben Dooks <ben-linux@fluff.org> | 2005-08-31 09:42:14 +0100 |
|---|---|---|
| committer |   Russell King <rmk+kernel@arm.linux.org.uk> | 2005-08-31 09:42:14 +0100 |
| commit | 3618886f645c2ede45742d3e3d22a96b2ee2f527 (patch) | |
| tree | 7fdfb43dd3a4db112343caccce091c12435210da /arch/arm/kernel | |
| parent | [ARM] 2853/1: Make alloc_init_supersection() work with 36-bit mappings (diff) | |
| download | linux-dev-3618886f645c2ede45742d3e3d22a96b2ee2f527.tar.xz linux-dev-3618886f645c2ede45742d3e3d22a96b2ee2f527.zip | |
[ARM] 2857/2: Dynamic tick - fix OOPS if configured and not provided
Patch from Ben Dooks
timer_dyn_reprogram() fails with an OOPS if the
configuration for CONFIG_NO_IDLE_HZ is enabled, and
the system has no support for it.
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/kernel')
| -rw-r--r-- | arch/arm/kernel/time.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/arch/arm/kernel/time.c b/arch/arm/kernel/time.c index 1b7fcd50c3e2..8880482dcbff 100644 --- a/arch/arm/kernel/time.c +++ b/arch/arm/kernel/time.c @@ -433,10 +433,12 @@ void timer_dyn_reprogram(void) { struct dyn_tick_timer *dyn_tick = system_timer->dyn_tick; - write_seqlock(&xtime_lock); - if (dyn_tick->state & DYN_TICK_ENABLED) - dyn_tick->reprogram(next_timer_interrupt() - jiffies); - write_sequnlock(&xtime_lock); + if (dyn_tick) { + write_seqlock(&xtime_lock); + if (dyn_tick->state & DYN_TICK_ENABLED) + dyn_tick->reprogram(next_timer_interrupt() - jiffies); + write_sequnlock(&xtime_lock); + } } static ssize_t timer_show_dyn_tick(struct sys_device *dev, char *buf) |