aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTorben Hohn <[email protected]>2011-01-27 16:00:17 +0100
committerThomas Gleixner <[email protected]>2011-01-31 14:55:46 +0100
commitbb1dfc1cf6c51ca42f7c05029a6f06df9092a0fc (patch)
tree8d2ef549a1f009ae2f4c68184378325462bd18b7
parente53f276beb655c711a5d1f25f800b61aa976e34f (diff)
parisc: Switch do_timer() to xtime_update()
xtime_update() takes the xtime_lock itself. Signed-off-by: Torben Hohn <[email protected]> Cc: [email protected] Cc: Peter Zijlstra <[email protected]> Cc: [email protected] Cc: Helge Deller <[email protected]> Cc: "James E.J. Bottomley" <[email protected]> Cc: Kyle McMartin <[email protected]> Cc: [email protected] LKML-Reference: <20110127150017.23248.22559.stgit@localhost> Signed-off-by: Thomas Gleixner <[email protected]>
-rw-r--r--arch/parisc/kernel/time.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/arch/parisc/kernel/time.c b/arch/parisc/kernel/time.c
index 05511ccb61d2..45b7389d77aa 100644
--- a/arch/parisc/kernel/time.c
+++ b/arch/parisc/kernel/time.c
@@ -162,11 +162,8 @@ irqreturn_t __irq_entry timer_interrupt(int irq, void *dev_id)
update_process_times(user_mode(get_irq_regs()));
}
- if (cpu == 0) {
- write_seqlock(&xtime_lock);
- do_timer(ticks_elapsed);
- write_sequnlock(&xtime_lock);
- }
+ if (cpu == 0)
+ xtime_update(ticks_elapsed);
return IRQ_HANDLED;
}