---

yaml --- r: 6627 b: refs/heads/master c: 3618886 h: refs/heads/master i: 6625: 79540df 6623: 1b6c7e0 v: v3
git-mirror · Aug 31, 2005 · 0aa7fa4 · 0aa7fa4
1 parent 4575f50
commit 0aa7fa4
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git 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
@@ -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)