[tip:timers/core] cris: arch-v10: Switch do_timer() to xtime_update()

From: tip-bot for Torben Hohn
Date: Mon Jan 31 2011 - 09:07:58 EST

Commit-ID: 17588b99183ece563013622afeefd37eb8e68fd3
Gitweb: http://git.kernel.org/tip/17588b99183ece563013622afeefd37eb8e68fd3
Author: Torben Hohn <torbenh@xxxxxx>
AuthorDate: Thu, 27 Jan 2011 15:59:36 +0100
Committer: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
CommitDate: Mon, 31 Jan 2011 14:55:44 +0100

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 <torbenh@xxxxxx>
Cc: hch@xxxxxxxxxxxxx
Cc: Jesper Nilsson <jesper.nilsson@xxxxxxxx>
Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
Cc: johnstul@xxxxxxxxxx
Cc: Mikael Starvik <starvik@xxxxxxxx>
Cc: yong.zhang0@xxxxxxxxx
LKML-Reference: <20110127145936.23248.16192.stgit@localhost>
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
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 */
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/