summaryrefslogtreecommitdiff
path: root/arch/m68k/mvme16x
diff options
context:
space:
mode:
authorTorben Hohn <torbenh@gmx.de>2011-01-27 16:00:06 +0100
committerThomas Gleixner <tglx@linutronix.de>2011-01-31 14:55:46 +0100
commite53f276beb655c711a5d1f25f800b61aa976e34f (patch)
tree4589d54fcfedc6654bb252caed350791a29a8248 /arch/m68k/mvme16x
parent7bde2ab7cb51f14c6f6574f0f5a78445f2caed3e (diff)
downloadlinux-next-e53f276beb655c711a5d1f25f800b61aa976e34f.tar.gz
m68k: Switch do_timer() to xtime_update()
xtime_update() properly takes the xtime_lock Signed-off-by: Torben Hohn <torbenh@gmx.de> Cc: Sam Creasey <sammy@sammy.net> Cc: Peter Zijlstra <peterz@infradead.org> Cc: johnstul@us.ibm.com Cc: Roman Zippel <zippel@linux-m68k.org> Cc: hch@infradead.org Cc: yong.zhang0@gmail.com Cc: Geert Uytterhoeven <geert@linux-m68k.org> Cc: Greg Ungerer <gerg@uclinux.org> LKML-Reference: <20110127150006.23248.71790.stgit@localhost> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/m68k/mvme16x')
-rw-r--r--arch/m68k/mvme16x/config.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/m68k/mvme16x/config.c b/arch/m68k/mvme16x/config.c
index 11edf61cc2c4..0b28e2621653 100644
--- a/arch/m68k/mvme16x/config.c
+++ b/arch/m68k/mvme16x/config.c
@@ -51,8 +51,8 @@ extern void mvme16x_reset (void);
int bcd2int (unsigned char b);
-/* Save tick handler routine pointer, will point to do_timer() in
- * kernel/sched.c, called via mvme16x_process_int() */
+/* Save tick handler routine pointer, will point to xtime_update() in
+ * kernel/time/timekeeping.c, called via mvme16x_process_int() */
static irq_handler_t tick_handler;