diff options
| author | Torben Hohn <torbenh@gmx.de> | 2011-01-27 15:59:51 +0100 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2011-01-31 14:55:45 +0100 |
| commit | daad8b581e7f5e21a2f79e49d57d4f6a73b26510 (patch) | |
| tree | 783244e32fb7deb2339761f08dc5958c7faaed34 /arch/h8300 | |
| parent | 57464bd87f708e75b47312766e3fc8dc3aaf66ad (diff) | |
| download | talos-op-linux-daad8b581e7f5e21a2f79e49d57d4f6a73b26510.tar.gz talos-op-linux-daad8b581e7f5e21a2f79e49d57d4f6a73b26510.zip | |
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>
Diffstat (limited to 'arch/h8300')
| -rw-r--r-- | arch/h8300/kernel/time.c | 4 | ||||
| -rw-r--r-- | 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 165005aff9df..32263a138aa6 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 3946c0fa8374..7a1533fad47d 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) |
