Commit bb1dfc1c authored Jan 27, 2011 by Torben Hohn Committed by Thomas Gleixner Jan 31, 2011

parisc: Switch do_timer() to xtime_update()

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>

parent e53f276b

arch/parisc/kernel/time.c

+2 −5

Original line number	Diff line number	Diff line
		@@ -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;
		}