---

yaml --- r: 234577 b: refs/heads/master c: 17588b9 h: refs/heads/master i: 234575: b5f0348 v: v3
git-mirror · Jan 31, 2011 · 75efabb · 75efabb
1 parent d052eec
commit 75efabb
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4196b892d55caaf2c98da05e80472ca482ca19fe
+refs/heads/master: 17588b99183ece563013622afeefd37eb8e68fd3
diff --git a/trunk/arch/cris/arch-v10/kernel/time.c b/trunk/arch/cris/arch-v10/kernel/time.c
@@ -140,7 +140,7 @@ stop_watchdog(void)
 
 /*
  * timer_interrupt() needs to keep up the real-time clock,
- * as well as call the "do_timer()" routine every clocktick
+ * as well as call the "xtime_update()" routine every clocktick
  */
 
 //static unsigned short myjiff; /* used by our debug routine print_timestamp */
@@ -176,7 +176,7 @@ timer_interrupt(int irq, void *dev_id)
 
 	/* call the real timer interrupt handler */
 
-	do_timer(1);
+	xtime_update(1);
 
         cris_do_profile(regs); /* Save profiling information */
         return IRQ_HANDLED;