summaryrefslogtreecommitdiffstats
path: root/arch/mips/kernel
diff options
context:
space:
mode:
authorVitaly Wool <vitalywool@gmail.com>2006-12-28 17:14:05 +0300
committerRalf Baechle <ralf@linux-mips.org>2007-01-08 21:41:04 +0000
commit2dbda7dceca81adfe57c8884be5c66e70822d89a (patch)
treee9fa10a80e32fa627d42512a6603b927f001428e /arch/mips/kernel
parent33b06b513e804ae64ebd5105fb703ec90bd7e173 (diff)
downloadtalos-op-linux-2dbda7dceca81adfe57c8884be5c66e70822d89a.tar.gz
talos-op-linux-2dbda7dceca81adfe57c8884be5c66e70822d89a.zip
[MIPS] PNX8550: Fix system timer support
the patch inlined below restores proper time accounting for PNX8550-based boards. It also gets rid of #ifdef in the generic code which becomes unnecessary then. It's functionally identical to the previous patch with the same name but it has minor comments from Atsushi and Sergei taken into account. Signed-off-by: Vitaly Wool <vwool@ru.mvista.com> Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/kernel')
-rw-r--r--arch/mips/kernel/time.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/mips/kernel/time.c b/arch/mips/kernel/time.c
index 11aab6d6bfe5..8aa544f73a5e 100644
--- a/arch/mips/kernel/time.c
+++ b/arch/mips/kernel/time.c
@@ -94,10 +94,8 @@ static void c0_timer_ack(void)
{
unsigned int count;
-#ifndef CONFIG_SOC_PNX8550 /* pnx8550 resets to zero */
/* Ack this timer interrupt and set the next one. */
expirelo += cycles_per_jiffy;
-#endif
write_c0_compare(expirelo);
/* Check to see if we have missed any timer interrupts. */
OpenPOWER on IntegriCloud