lkml.org 
[lkml]   [2011]   [Jan]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 07/18] cris/arch-v10: switch do_timer() to xtime_update()
Date
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 <torbenh@gmx.de>
---
arch/cris/arch-v10/kernel/time.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/cris/arch-v10/kernel/time.c b/arch/cris/arch-v10/kernel/time.c
index 00eb36f..20c85b5 100644
--- 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;
--
1.7.2.3


\
 
 \ /
  Last update: 2011-01-22 00:11    [from the cache]
©2003-2011 Jasper Spaans