Merge branch 'master' into h8300

[uclinux-h8/linux.git] / arch / h8300 / kernel / time.c

diff --git a/arch/h8300/kernel/time.c b/arch/h8300/kernel/time.c
index d69976e..20d2140 100644 (file)
--- a/arch/h8300/kernel/time.c
+++ b/arch/h8300/kernel/time.c
@@ -36,9 +36,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()));
 }