From 0aa7fa4fa58488a69c0915a26f73ce6f941a4983 Mon Sep 17 00:00:00 2001 From: Ben Dooks Date: Wed, 31 Aug 2005 09:42:14 +0100 Subject: [PATCH] --- yaml --- r: 6627 b: refs/heads/master c: 3618886f645c2ede45742d3e3d22a96b2ee2f527 h: refs/heads/master i: 6625: 79540dfb514f57c6d27031e21315fcba02e6ffb7 6623: 1b6c7e0264671043d1712b05ec706ab16fb4857e v: v3 --- [refs] | 2 +- trunk/arch/arm/kernel/time.c | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index e723502b02e6..e50d2a66674e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 083bc6b3c9b52b5998cc49d4aa2f8f15c2e84e6b +refs/heads/master: 3618886f645c2ede45742d3e3d22a96b2ee2f527 diff --git a/trunk/arch/arm/kernel/time.c b/trunk/arch/arm/kernel/time.c index 1b7fcd50c3e2..8880482dcbff 100644 --- a/trunk/arch/arm/kernel/time.c +++ b/trunk/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)