diff options
| author | Linus Torvalds <torvalds@evo.osdl.org> | 2005-09-01 10:56:57 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@evo.osdl.org> | 2005-09-01 10:56:57 -0700 |
| commit | b25dd2842bcaef2413db7a06c67034b187aa007f (patch) | |
| tree | ad489c6e7ef828be8b411e00b7c5609769c6a3fb /arch/arm/kernel/time.c | |
| parent | 80ac2912f846c01d702774bb6aa7100ec71e88b9 (diff) | |
| parent | 147056fb84150966d736fe21fa01d5e0f08e0980 (diff) | |
Merge HEAD from master.kernel.org:/home/rmk/linux-2.6-arm.git
Diffstat (limited to 'arch/arm/kernel/time.c')
| -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 1b7fcd50c3e..8880482dcbf 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) |