cris: arch-v10: Switch do_timer() to xtime_update()

This code failed to take the xtime_lock, which must be held when
calling do_timer(). Use the safe version xtime_update()

Signed-off-by: Torben Hohn <[email protected]>
Cc: [email protected]
Cc: Jesper Nilsson <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Cc: [email protected]
Cc: Mikael Starvik <[email protected]>
Cc: [email protected]
LKML-Reference: <20110127145936.23248.16192.stgit@localhost>
Signed-off-by: Thomas Gleixner <[email protected]>

diff --git a/arch/cris/arch-v10/kernel/time.c b/arch/cris/arch-v10/kernel/time.c
index 00eb36f8debf10484912f35fb12af2452eb947fe..20c85b5dc7d0950e860193def61e5ffa5e14ffee 100644 (file)
--- a/arch/cris/arch-v10/kernel/time.c
+++ b/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;