CVS Update@linux-mips.org: linux

[ppopov@linux-mips.org]

CVSROOT:        /home/cvs
Module name:    linux
Changes by:     ppopov@ftp.linux-mips.org       05/08/10 22:03:31

Modified files:
        arch/mips/kernel: time.c 

Log message:
        Put back PNX8550 time hack, with Ralf's permission.

diff -urN linux/arch/mips/kernel/time.c linux/arch/mips/kernel/time.c
--- linux/arch/mips/kernel/time.c       2005/08/04 17:51:45     1.85
+++ linux/arch/mips/kernel/time.c       2005/08/10 21:03:31     1.86
@@ -11,6 +11,7 @@
  * Free Software Foundation;  either version 2 of the  License, or (at your
  * option) any later version.
  */
+#include <linux/config.h>
 #include <linux/types.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
@@ -112,8 +113,10 @@
 {
        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.  */