| dyntick-missing2.patch
|
| Files affected:
|   arch/arm/kernel/time.c |   10 	6 +	4 -	0 !
|   1 files changed, 6 insertions(+), 4 deletions(-)
|
| Ben Dooks, Sun, 25 Sep 2005 15:37:07 +0100

diff -urN -X ../dontdiff linux-2.6.13-rc7-bjd1/arch/arm/kernel/time.c linux-2.6.13-rc7-bjd2/arch/arm/kernel/time.c
--- linux-2.6.13-rc7-bjd1/arch/arm/kernel/time.c	2005-08-27 12:18:24.000000000 +0100
+++ linux-2.6.13-rc7-bjd2/arch/arm/kernel/time.c	2005-08-30 10:38:32.000000000 +0100
@@ -433,10 +433,12 @@
 {
 	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)