From 3739867b74e1443f9e875fd3106d224a5117e2b2 Mon Sep 17 00:00:00 2001 From: Torben Hohn Date: Thu, 27 Jan 2011 16:00:27 +0100 Subject: [PATCH] --- yaml --- r: 234586 b: refs/heads/master c: d12b0e24c56c6fb2398609f26858e5278d688840 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/xtensa/kernel/time.c | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index f10da8ad3f89..a5d42d22cb8c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4ea1b72551d052a3993ef72ce06ecf5bdd125859 +refs/heads/master: d12b0e24c56c6fb2398609f26858e5278d688840 diff --git a/trunk/arch/xtensa/kernel/time.c b/trunk/arch/xtensa/kernel/time.c index 19df764f6399..f3e5eb43f71c 100644 --- a/trunk/arch/xtensa/kernel/time.c +++ b/trunk/arch/xtensa/kernel/time.c @@ -96,16 +96,12 @@ irqreturn_t timer_interrupt (int irq, void *dev_id) update_process_times(user_mode(get_irq_regs())); #endif - write_seqlock(&xtime_lock); - - do_timer(1); /* Linux handler in kernel/timer.c */ + xtime_update(1); /* Linux handler in kernel/time/timekeeping */ /* Note that writing CCOMPARE clears the interrupt. */ next += CCOUNT_PER_JIFFY; set_linux_timer(next); - - write_sequnlock(&xtime_lock); } /* Allow platform to do something useful (Wdog). */