Browse Source

h8300: Switch do_timer() to xtime_update()

xtime_update() takes the xtime_lock itself.

Signed-off-by: Torben Hohn <torbenh@gmx.de>
Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: johnstul@us.ibm.com
Cc: hch@infradead.org
Cc: yong.zhang0@gmail.com
LKML-Reference: <20110127145951.23248.92727.stgit@localhost>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Torben Hohn 14 years ago
parent
commit
daad8b581e
2 changed files with 2 additions and 4 deletions
  1. 1 3
      arch/h8300/kernel/time.c
  2. 1 1
      arch/h8300/kernel/timer/timer8.c

+ 1 - 3
arch/h8300/kernel/time.c

@@ -35,9 +35,7 @@ void h8300_timer_tick(void)
 {
 {
 	if (current->pid)
 	if (current->pid)
 		profile_tick(CPU_PROFILING);
 		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()));
 	update_process_times(user_mode(get_irq_regs()));
 }
 }
 
 

+ 1 - 1
arch/h8300/kernel/timer/timer8.c

@@ -61,7 +61,7 @@
 
 
 /*
 /*
  * timer_interrupt() needs to keep up the real-time clock,
  * 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)
 static irqreturn_t timer_interrupt(int irq, void *dev_id)