From: Ben Dooks Date: Wed, 31 Aug 2005 08:42:14 +0000 (+0100) Subject: [ARM] 2857/2: Dynamic tick - fix OOPS if configured and not provided X-Git-Tag: upstream/snapshot3+hdmi~46862^2~3 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3618886f645c2ede45742d3e3d22a96b2ee2f527;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git [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 Signed-off-by: Russell King --- diff --git a/arch/arm/kernel/time.c b/arch/arm/kernel/time.c index 1b7fcd5..8880482 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)