[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20110127145936.23248.16192.stgit@localhost>
Date: Thu, 27 Jan 2011 15:59:36 +0100
From: Torben Hohn <torbenh@....de>
To: LKML <linux-kernel@...r.kernel.org>
Cc: hch@...radead.org, Jesper Nilsson <jesper.nilsson@...s.com>,
Peter Zijlstra <peterz@...radead.org>, johnstul@...ibm.com,
Mikael Starvik <starvik@...s.com>, yong.zhang0@...il.com,
Thomas Gleixner <tglx@...utronix.de>
Subject: [PATCH v2 09/20] 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()
Cc: Mikael Starvik <starvik@...s.com>
Cc: Jesper Nilsson <jesper.nilsson@...s.com>
Signed-off-by: Torben Hohn <torbenh@....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;
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists