Skip to content

Commit

Permalink
xtensa: Switch do_timer() to xtime_update()
Browse files Browse the repository at this point in the history
xtime_update() takes the xtime_lock itself.

set_linux_timer() does not need to be protected by xtime_lock.

[ tglx: This code is broken on SMP anyway. ]

Signed-off-by: Torben Hohn <torbenh@gmx.de>
Cc: Chris Zankel <chris@zankel.net>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: johnstul@us.ibm.com
Cc: hch@infradead.org
Cc: yong.zhang0@gmail.com
LKML-Reference: <20110127150027.23248.61798.stgit@localhost>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
  • Loading branch information
Torben Hohn authored and Thomas Gleixner committed Jan 31, 2011
1 parent 4ea1b72 commit d12b0e2
Showing 1 changed file with 1 addition and 5 deletions.
6 changes: 1 addition & 5 deletions arch/xtensa/kernel/time.c
Original file line number Diff line number Diff line change
Expand Up @@ -96,16 +96,12 @@ irqreturn_t timer_interrupt (int irq, void *dev_id)
update_process_times(user_mode(get_irq_regs()));
#endif

write_seqlock(&xtime_lock);

do_timer(1); /* Linux handler in kernel/timer.c */
xtime_update(1); /* Linux handler in kernel/time/timekeeping */

/* Note that writing CCOMPARE clears the interrupt. */

next += CCOUNT_PER_JIFFY;
set_linux_timer(next);

write_sequnlock(&xtime_lock);
}

/* Allow platform to do something useful (Wdog). */
Expand Down

0 comments on commit d12b0e2

Please sign in to comment.