From 75efabb0808ab3db5b42aa87c926c1d6be6005e5 Mon Sep 17 00:00:00 2001 From: Torben Hohn Date: Thu, 27 Jan 2011 15:59:36 +0100 Subject: [PATCH] --- yaml --- r: 234577 b: refs/heads/master c: 17588b99183ece563013622afeefd37eb8e68fd3 h: refs/heads/master i: 234575: b5f0348bcfc62a43dbe32c22042dd124b8447853 v: v3 --- [refs] | 2 +- trunk/arch/cris/arch-v10/kernel/time.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 585c21cc56e0..4f39209a7eda 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4196b892d55caaf2c98da05e80472ca482ca19fe +refs/heads/master: 17588b99183ece563013622afeefd37eb8e68fd3 diff --git a/trunk/arch/cris/arch-v10/kernel/time.c b/trunk/arch/cris/arch-v10/kernel/time.c index 00eb36f8debf..20c85b5dc7d0 100644 --- a/trunk/arch/cris/arch-v10/kernel/time.c +++ b/trunk/arch/cris/arch-v10/kernel/time.c @@ -140,7 +140,7 @@ stop_watchdog(void) /* * timer_interrupt() needs to keep up the real-time clock, - * as well as call the "do_timer()" routine every clocktick + * as well as call the "xtime_update()" routine every clocktick */ //static unsigned short myjiff; /* used by our debug routine print_timestamp */ @@ -176,7 +176,7 @@ timer_interrupt(int irq, void *dev_id) /* call the real timer interrupt handler */ - do_timer(1); + xtime_update(1); cris_do_profile(regs); /* Save profiling information */ return IRQ_HANDLED;