]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
parisc: Switch do_timer() to xtime_update()
authorTorben Hohn <torbenh@gmx.de>
Thu, 27 Jan 2011 15:00:17 +0000 (16:00 +0100)
committerThomas Gleixner <tglx@linutronix.de>
Mon, 31 Jan 2011 13:55:46 +0000 (14:55 +0100)
xtime_update() takes the xtime_lock itself.

Signed-off-by: Torben Hohn <torbenh@gmx.de>
Cc: hch@infradead.org
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: johnstul@us.ibm.com
Cc: Helge Deller <deller@gmx.de>
Cc: "James E.J. Bottomley" <jejb@parisc-linux.org>
Cc: Kyle McMartin <kyle@mcmartin.ca>
Cc: yong.zhang0@gmail.com
LKML-Reference: <20110127150017.23248.22559.stgit@localhost>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
arch/parisc/kernel/time.c

index 05511ccb61d24a9bc8735f9897537e3bd520b825..45b7389d77aa5a18e1ce4adf883ff7c985b320cc 100644 (file)
@@ -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;
 }