diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-02-03 22:19:37 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-02-03 22:19:37 +0100 |
| commit | 44dac676519ec87e4528db86e47cb86ff95382e4 (patch) | |
| tree | 36fa4844633ee83ce5b0571d28f89bd9902d44d1 /arch/cris/arch-v32 | |
| parent | 45833c1902e33b41e9e1012be8eab74db1db032f (diff) | |
| parent | 0606f422b453f76c31ab2b1bd52943ff06a2dcf2 (diff) | |
manual merge of timers/core
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/cris/arch-v32')
| -rw-r--r-- | arch/cris/arch-v32/kernel/time.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/cris/arch-v32/kernel/time.c b/arch/cris/arch-v32/kernel/time.c index a545211e999d..bb978ede8985 100644 --- a/arch/cris/arch-v32/kernel/time.c +++ b/arch/cris/arch-v32/kernel/time.c @@ -183,7 +183,7 @@ void handle_watchdog_bite(struct pt_regs *regs) /* * 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. */ extern void cris_do_profile(struct pt_regs *regs); @@ -216,9 +216,7 @@ static inline irqreturn_t timer_interrupt(int irq, void *dev_id) return IRQ_HANDLED; /* Call the real timer interrupt handler */ - write_seqlock(&xtime_lock); - do_timer(1); - write_sequnlock(&xtime_lock); + xtime_update(1); return IRQ_HANDLED; } |