diff options
| author | Torben Hohn <torbenh@gmx.de> | 2011-01-27 15:59:31 +0100 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2011-01-31 14:55:44 +0100 |
| commit | 4196b892d55caaf2c98da05e80472ca482ca19fe (patch) | |
| tree | 2f717554b11b5302ab71973e274ec3f89ae99a14 /arch/blackfin/kernel | |
| parent | ec2dff2febf19ff2109c2eb3e56d5a969fe399e2 (diff) | |
| download | kernel_samsung_aries-4196b892d55caaf2c98da05e80472ca482ca19fe.zip kernel_samsung_aries-4196b892d55caaf2c98da05e80472ca482ca19fe.tar.gz kernel_samsung_aries-4196b892d55caaf2c98da05e80472ca482ca19fe.tar.bz2 | |
blackfin: Switch from do_timer() to xtime_update()
xtime_update() takes the xtime_lock itself.
Signed-off-by: Torben Hohn <torbenh@gmx.de>
Cc: Mike Frysinger <vapier@gentoo.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: johnstul@us.ibm.com
Cc: hch@infradead.org
Cc: yong.zhang0@gmail.com
LKML-Reference: <20110127145931.23248.33917.stgit@localhost>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/blackfin/kernel')
| -rw-r--r-- | arch/blackfin/kernel/time.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/blackfin/kernel/time.c b/arch/blackfin/kernel/time.c index c911361..8d73724 100644 --- a/arch/blackfin/kernel/time.c +++ b/arch/blackfin/kernel/time.c @@ -114,16 +114,14 @@ u32 arch_gettimeoffset(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 */ #ifdef CONFIG_CORE_TIMER_IRQ_L1 __attribute__((l1_text)) #endif irqreturn_t timer_interrupt(int irq, void *dummy) { - write_seqlock(&xtime_lock); - do_timer(1); - write_sequnlock(&xtime_lock); + xtime_update(1); #ifdef CONFIG_IPIPE update_root_process_times(get_irq_regs()); |