| Subject | [PATCH v2 12/20] h8300: switch do_timer() to xtime_update() | From | Torben Hohn <> | Date | Thu, 27 Jan 2011 15:59:51 +0100 |
| |
xtime_update() takes the xtime_lock itself.
Cc: Yoshinori Sato <ysato@users.sourceforge.jp> Signed-off-by: Torben Hohn <torbenh@gmx.de> --- arch/h8300/kernel/time.c | 4 +--- arch/h8300/kernel/timer/timer8.c | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/arch/h8300/kernel/time.c b/arch/h8300/kernel/time.c index 165005a..32263a1 100644 --- a/arch/h8300/kernel/time.c +++ b/arch/h8300/kernel/time.c @@ -35,9 +35,7 @@ void h8300_timer_tick(void) { if (current->pid) profile_tick(CPU_PROFILING); - write_seqlock(&xtime_lock); - do_timer(1); - write_sequnlock(&xtime_lock); + xtime_update(1); update_process_times(user_mode(get_irq_regs())); } diff --git a/arch/h8300/kernel/timer/timer8.c b/arch/h8300/kernel/timer/timer8.c index 3946c0f..7a1533f 100644 --- a/arch/h8300/kernel/timer/timer8.c +++ b/arch/h8300/kernel/timer/timer8.c @@ -61,7 +61,7 @@ /* * 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 irqreturn_t timer_interrupt(int irq, void *dev_id)
|