[tip:timers/core] arm: Switch from do_timer() to xtime_update()

From: tip-bot for Torben Hohn
Date: Mon Jan 31 2011 - 09:06:54 EST


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

arm: Switch from do_timer() to xtime_update()

xtime_update takes the xtime_lock itself.

Signed-off-by: Torben Hohn <torbenh@xxxxxx>
Cc: Russell King <linux@xxxxxxxxxxxxxxxx>
Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
Cc: johnstul@xxxxxxxxxx
Cc: hch@xxxxxxxxxxxxx
Cc: yong.zhang0@xxxxxxxxx
LKML-Reference: <20110127145920.23248.75541.stgit@localhost>
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
---
arch/arm/kernel/time.c | 4 +---
1 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/arch/arm/kernel/time.c b/arch/arm/kernel/time.c
index 3d76bf2..1ff46ca 100644
--- a/arch/arm/kernel/time.c
+++ b/arch/arm/kernel/time.c
@@ -107,9 +107,7 @@ void timer_tick(void)
{
profile_tick(CPU_PROFILING);
do_leds();
- write_seqlock(&xtime_lock);
- do_timer(1);
- write_sequnlock(&xtime_lock);
+ xtime_update(1);
#ifndef CONFIG_SMP
update_process_times(user_mode(get_irq_regs()));
#endif
--
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/